diff mbox

berkeleydb: workaround m68k/coldfire issue

Message ID 20170222125110.GA27092@waldemar-brodkorb.de
State Accepted
Headers show

Commit Message

Waldemar Brodkorb Feb. 22, 2017, 12:51 p.m. UTC
Fixes:
 http://autobuild.buildroot.net/results/40423aa6c8f6fe66c771cca3e09b21e15525eb5f

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
 package/berkeleydb/berkeleydb.mk | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Thomas Petazzoni Feb. 22, 2017, 8:34 p.m. UTC | #1
Hello,

On Wed, 22 Feb 2017 13:51:10 +0100, Waldemar Brodkorb wrote:

>  # 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) \

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
diff mbox

Patch

diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index e5c11bd..fdc64a8 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -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) \