Skip to contentSkip to conversation

package/bitcoin: unset the NDEBUG flag

PATCH Superseded Dick Olsson 2 participants 7 messages Jun 11, 2021 – Jun 14, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/bitcoin: unset the NDEBUG flag

Since https://git.buildroot.net/buildroot/commit/?id=5a8c50fe05afacc3cbe8e7347e238da9f242fab0
all packages are now built with NDEBUG, which broke Bitcoin builds.

Bitcoin is using assert(...) extensively with the assumption of it never being a noop at runtime. So we cannot build with NDEBUG.
See: https://github.com/bitcoin/bitcoin/blob/0.21/src/compat/assumptions.h

---
 package/bitcoin/bitcoin.mk | 3 +++
 1 file changed, 3 insertions(+)
package/bitcoin/bitcoin.mk +3 -0
index 5f1684879c..27fc2d5051 100644
@@ -13,6 +13,9 @@ BITCOIN_CPE_ID_VENDOR = bitcoin
 BITCOIN_CPE_ID_PRODUCT = bitcoin_core
 BITCOIN_DEPENDENCIES = host-pkgconf boost libevent
 BITCOIN_MAKE_ENV = BITCOIN_GENBUILD_NO_GIT=1
+# Bitcoin is using assert(...) extensively with the assumption of it
+# never being a noop at runtime. So we cannot build with NDEBUG.
+BITCOIN_CONF_ENV = CFLAGS="-UNDEBUG" CXXFLAGS="-UNDEBUG"
 BITCOIN_CONF_OPTS = \
 	--disable-bench \
 	--disable-wallet \
Signature · 1 line
2.30.2
#1 lore raw

PATCH 1/1 package/bitcoin: unset the NDEBUG flag

Dick, All,

On 2021-06-11 20:06 +0000, Dick Olsson via buildroot spake thusly:

Quoted 17 lines

Since https://git.buildroot.net/buildroot/commit/?id=5a8c50fe05afacc3cbe8e7347e238da9f242fab0
all packages are now built with NDEBUG, which broke Bitcoin builds.

Bitcoin is using assert(...) extensively with the assumption of it never being a noop at runtime. So we cannot build with NDEBUG.
See: https://github.com/bitcoin/bitcoin/blob/0.21/src/compat/assumptions.h

---
 package/bitcoin/bitcoin.mk | 3 +++
 1 file changed, 3 insertions(+)
package/bitcoin/bitcoin.mk +0 -0
index 5f1684879c..27fc2d5051 100644

package/bitcoin/bitcoin.mk BITCOIN_CPE_ID_VENDOR = bitcoin · line 18

Quoted 6 lines
package/bitcoin/bitcoin.mk +3 -0
@@ -13,6 +13,9 @@ BITCOIN_CPE_ID_VENDOR = bitcoin
 BITCOIN_CPE_ID_PRODUCT = bitcoin_core
 BITCOIN_DEPENDENCIES = host-pkgconf boost libevent
 BITCOIN_MAKE_ENV = BITCOIN_GENBUILD_NO_GIT=1
+# Bitcoin is using assert(...) extensively with the assumption of it
+# never being a noop at runtime. So we cannot build with NDEBUG.
+BITCOIN_CONF_ENV = CFLAGS="-UNDEBUG" CXXFLAGS="-UNDEBUG"

That's insufficient, because that will entirely override the original CFLAGS/CXXFLAGS the autotools infra is passing:

https://git.buildroot.org/buildroot/tree/package/pkg-autotools.mk#n180

with CFLAGS et al. inherited from TARGET_CONFIGURE_OPTS:

https://git.buildroot.org/buildroot/tree/package/Makefile.in#n252

In this case, since you override the infra-provided flags, the -DNDEBUG is not present in the flags, so it is not surprising that it works.

So, the proper solution is to extend them.

Additionally, I thing we should also override CPPFLAGS.

    BITCOIN_CONF_ENV = \
        CPPFLAGS="$(TARGET_CPPFLAGS) -UNDEBUG" \
        CFLAGS="$(TARGET_CFLAGS) -UNDEBUG" \
        CXXFLAGS="$(TARGET_CXXFLAGS) -UNDEBUG"

Can you check this is still working, and if so respin a patch?

An alternative solution, *iff* the above does not work, would be to filter out -DNDEBUG, like so:

    BITCOIN_CONF_ENV = \
        CPPFLAGS="$(filter-out -DNDEBUG,$(TARGET_CPPFLAGS))" \
        CFLAGS="$(filter-out -DNDEBUG,$(TARGET_CFLAGS))" \
        CXXFLAGS="$(filter-out -DNDEBUG,$(TARGET_CXXFLAGS))"

Regards,
Yann E. MORIN.

Quoted 11 lines
package/bitcoin/bitcoin.mk +0 -0
 BITCOIN_CONF_OPTS = \
 	--disable-bench \
 	--disable-wallet \
Signature · 7 lines
2.30.2


_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH v2 1/1 package/bitcoin: unset the NDEBUG flag

Since https://git.buildroot.net/buildroot/commit/?id=5a8c50fe05afacc3cbe8e7347e238da9f242fab0
all packages are now built with NDEBUG, which broke Bitcoin builds.

Bitcoin is using assert(...) extensively with the assumption of it never being a noop at runtime. So we cannot build with NDEBUG.
See: https://github.com/bitcoin/bitcoin/blob/0.21/src/compat/assumptions.h

---

Revision 2:

- Fixed review item by Yann
- Properly include all target flags

---
 package/bitcoin/bitcoin.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/bitcoin/bitcoin.mk +6 -0
index 5f1684879c..5b2613e2f9 100644
@@ -13,6 +13,12 @@ BITCOIN_CPE_ID_VENDOR = bitcoin
 BITCOIN_CPE_ID_PRODUCT = bitcoin_core
 BITCOIN_DEPENDENCIES = host-pkgconf boost libevent
 BITCOIN_MAKE_ENV = BITCOIN_GENBUILD_NO_GIT=1
+# Bitcoin is using assert(...) extensively with the assumption of it
+# never being a noop at runtime. So we cannot build with NDEBUG.
+BITCOIN_CONF_ENV = \
+        CPPFLAGS="$(TARGET_CPPFLAGS) -UNDEBUG" \
+        CFLAGS="$(TARGET_CFLAGS) -UNDEBUG" \
+        CXXFLAGS="$(TARGET_CXXFLAGS) -UNDEBUG"
 BITCOIN_CONF_OPTS = \
 	--disable-bench \
 	--disable-wallet \
Signature · 1 line
2.30.2
#3 lore raw

PATCH v3 1/1 package/bitcoin: unset the NDEBUG flag

In reply to Yann E. MORIN

Since https://git.buildroot.net/buildroot/commit/?id=5a8c50fe05afacc3cbe8e7347e238da9f242fab0
all packages are now built with NDEBUG, which broke Bitcoin builds.

Bitcoin is using assert(...) extensively with the assumption of it never being a noop at runtime. So we cannot build with NDEBUG.
See: https://github.com/bitcoin/bitcoin/blob/0.21/src/compat/assumptions.h

---

Revision 2:

- Fixed review item by Yann
- Properly include all target flags

Revision 3:

- Fixed tab indentation

---
 package/bitcoin/bitcoin.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/bitcoin/bitcoin.mk +6 -0
index 5f1684879c..409c9a61c9 100644
@@ -13,6 +13,12 @@ BITCOIN_CPE_ID_VENDOR = bitcoin
 BITCOIN_CPE_ID_PRODUCT = bitcoin_core
 BITCOIN_DEPENDENCIES = host-pkgconf boost libevent
 BITCOIN_MAKE_ENV = BITCOIN_GENBUILD_NO_GIT=1
+# Bitcoin is using assert(...) extensively with the assumption of it
+# never being a noop at runtime. So we cannot build with NDEBUG.
+BITCOIN_CONF_ENV = \
+	CPPFLAGS="$(TARGET_CPPFLAGS) -UNDEBUG" \
+	CFLAGS="$(TARGET_CFLAGS) -UNDEBUG" \
+	CXXFLAGS="$(TARGET_CXXFLAGS) -UNDEBUG"
 BITCOIN_CONF_OPTS = \
 	--disable-bench \
 	--disable-wallet \
Signature · 1 line
2.30.2
#4 lore raw

PATCH v3 1/1 package/bitcoin: unset the NDEBUG flag

Dick, All,

On 2021-06-13 18:45 +0000, Dick Olsson via buildroot spake thusly:

Quoted 8 lines

Since https://git.buildroot.net/buildroot/commit/?id=5a8c50fe05afacc3cbe8e7347e238da9f242fab0
all packages are now built with NDEBUG, which broke Bitcoin builds.

Bitcoin is using assert(...) extensively with the assumption of it never being a noop at runtime. So we cannot build with NDEBUG.
See: https://github.com/bitcoin/bitcoin/blob/0.21/src/compat/assumptions.h

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 39 lines

---

Revision 2:

- Fixed review item by Yann
- Properly include all target flags

Revision 3:

- Fixed tab indentation

---
 package/bitcoin/bitcoin.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/bitcoin/bitcoin.mk +6 -0
index 5f1684879c..409c9a61c9 100644
@@ -13,6 +13,12 @@ BITCOIN_CPE_ID_VENDOR = bitcoin
 BITCOIN_CPE_ID_PRODUCT = bitcoin_core
 BITCOIN_DEPENDENCIES = host-pkgconf boost libevent
 BITCOIN_MAKE_ENV = BITCOIN_GENBUILD_NO_GIT=1
+# Bitcoin is using assert(...) extensively with the assumption of it
+# never being a noop at runtime. So we cannot build with NDEBUG.
+BITCOIN_CONF_ENV = \
+	CPPFLAGS="$(TARGET_CPPFLAGS) -UNDEBUG" \
+	CFLAGS="$(TARGET_CFLAGS) -UNDEBUG" \
+	CXXFLAGS="$(TARGET_CXXFLAGS) -UNDEBUG"
 BITCOIN_CONF_OPTS = \
 	--disable-bench \
 	--disable-wallet \
Signature · 7 lines
2.30.2


_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author
#5 lore raw

PATCH v3 1/1 package/bitcoin: unset the NDEBUG flag

Hi Yann,

Quoted 5 lines · Yann E. MORIN
Quoted 1 line
Signed-off-by Dick Olsson hi at senzilla.io

Applied to master, thanks.

Regards,
Yann E. MORIN.

Should we apply this to the 'next' branch as well? The bitcoin build is currently broken there. But I'm not sure exactly how the 'master' and 'next' branches are managed?

Cheers,
D. Olsson

#6 lore raw

PATCH v3 1/1 package/bitcoin: unset the NDEBUG flag

Dick, All,

On 2021-06-14 10:06 +0000, D. Olsson spake thusly:

Quoted 5 lines · Yann E. MORIN
Quoted 2 lines
Quoted 1 line
Signed-off-by Dick Olsson hi at senzilla.io

Applied to master, thanks.

Should we apply this to the 'next' branch as well? The bitcoin build is currently broken there.

Branch 'next' is closed; it has been merged back into master with commit 8d07baab43, dated 2021-06-07.

Quoted 2 lines

But I'm not sure exactly how the 'master' and 'next' branches are managed?

https://buildroot.org/downloads/manual/manual.html#RELENG

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'