Skip to contentSkip to conversation

berkeleydb: workaround m68k/coldfire issue

PATCH New Waldemar Brodkorb 2 participants 2 messages Feb 22, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 berkeleydb: workaround m68k/coldfire issue

Fixes:
http://autobuild.buildroot.net/results/40423aa6c8f6fe66c771cca3e09b21e15525eb5f

---
 package/berkeleydb/berkeleydb.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/berkeleydb/berkeleydb.mk +7 -0
index e5c11bd..fdc64a8 100644
@@ -20,11 +20,18 @@ BERKELEYDB_BINARIES = db_archive db_checkpoint db_deadlock db_dump \
 	db_hotbackup db_load db_log_verify db_printlog db_recover db_replicate \
 	db_stat db_tuner db_upgrade db_verify
 
+# Internal error, aborting at dw2gencfi.c:214 in emit_expr_encoded
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509
+ifeq ($(BR2_m68k_cf),y)
+BERKELEYDB_CONF_OPTS += CXXFLAGS="$(TARGET_CXXFLAGS) -fno-dwarf2-cfi-asm"
+endif
+
 # build directory can't be the directory where configure are there, so..
 define BERKELEYDB_CONFIGURE_CMDS
 	(cd $(@D)/build_unix; rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
+		$(BERKELEYDB_CONF_OPTS) \
 		../dist/configure $(QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 berkeleydb: workaround m68k/coldfire issue

Hello,

package/berkeleydb/berkeleydb.mk BERKELEYDB_BINARIES = db_archive db_checkpoint db_deadlock db_dump \ · line 34

Quoted 6 lines · Waldemar Brodkorb
 # build directory can't be the directory where configure are there, so..
 define BERKELEYDB_CONFIGURE_CMDS
package/berkeleydb/berkeleydb.mk +1 -0
 	(cd $(@D)/build_unix; rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
+		$(BERKELEYDB_CONF_OPTS) \

Since it's passed in the environment of configure and not as an option, I renamed this variable to BERKELEYDB_CONF_ENV, which is more consistent with what we do in the autotools-package infrastructure.

Applied with this fix. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com