summaryrefslogtreecommitdiff
path: root/package/libasplib
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2017-01-01 13:02:44 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-01-25 16:44:42 +1300
commit336c2a4db0331fd2bfc8a2798337d9c58d4cbc1c (patch)
tree1f4617f5b9d02859b0bcbd614ab29bb2663262a2 /package/libasplib
parent4f1c60326f3b6afdb297403889a1be70d85bc24d (diff)
package/libasplib: fix build error on m68k
Patch written by Waldemar Brodkorb: http://lists.busybox.net/pipermail/buildroot/2016-November/177726.html This patch however did not work: "Unfortunately libasplib cmake infrastructure ignores my CMAKE_CXX_FLAGS." To make this patch work libasplib needed to be bumped because the cmake infrastructure was updated back in August 2016 which fixed the problem: https://github.com/AchimTuran/asplib/commit/6326d1f5e8dad9fd9947b7f4688ddddda91e9e9e Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/libasplib')
-rw-r--r--package/libasplib/libasplib.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/package/libasplib/libasplib.mk b/package/libasplib/libasplib.mk
index 038fc389e..b3b1fdb30 100644
--- a/package/libasplib/libasplib.mk
+++ b/package/libasplib/libasplib.mk
@@ -18,4 +18,11 @@ LIBASPLIB_CONF_OPTS = \
-DBUILD_SIGNALS=ON \
-DBUILD_TIMER=ON
+# Internal error, aborting at dw2gencfi.c:214 in emit_expr_encoded
+ifeq ($(BR2_m68k_cf),y)
+LIBASPLIB_CXXFLAGS += -fno-dwarf2-cfi-asm
+endif
+
+LIBASPLIB_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(LIBASPLIB_CXXFLAGS)"
+
$(eval $(cmake-package))