Skip to contentSkip to conversation

package/rocksdb: fix build on m68k_cf

PATCH New Fabrice Fontaine 3 participants 5 messages Mar 28, 2020 – Apr 7, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/rocksdb: fix build on m68k_cf

Fixes:
- http://autobuild.buildroot.org/results/04c5afff034d8d71d11b95c998e3156292852de6

---
 package/rocksdb/rocksdb.mk | 8 ++++++++
 1 file changed, 8 insertions(+)
package/rocksdb/rocksdb.mk +8 -0
index 5f9fd9f1cb..86732ad46c 100644
@@ -12,6 +12,12 @@ ROCKSDB_INSTALL_STAGING = YES
 
 ROCKSDB_MAKE_OPTS = PORTABLE=1
 
+# Internal error, aborting at dwarf2cfi.c:2802 in connect_traces
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864
+ifeq ($(BR2_m68k_cf),y)
+ROCKSDB_EXTRA_CXXFLAGS += -fno-defer-pop
+endif
+
 ifeq ($(BR2_PACKAGE_BZIP2),y)
 ROCKSDB_DEPENDENCIES += bzip2
 ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_BZ2=0
@@ -72,6 +78,8 @@ ROCKSDB_BUILD_TARGETS += shared_lib static_lib
 ROCKSDB_INSTALL_TARGETS += install-shared install-static
 endif
 
+ROCKSDB_MAKE_OPTS += EXTRA_CXXFLAGS="$(ROCKSDB_EXTRA_CXXFLAGS)"
+
 define ROCKSDB_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) $(ROCKSDB_MAKE_OPTS) -C $(@D) \
 		$(ROCKSDB_BUILD_TARGETS)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/2 package/rocksdb: fix build without dlfcn.h

Fixes:
- http://autobuild.buildroot.org/results/04c5afff034d8d71d11b95c998e3156292852de6

---
 package/rocksdb/rocksdb.mk | 1 +
 1 file changed, 1 insertion(+)
package/rocksdb/rocksdb.mk +1 -0
index 86732ad46c..31a9f98b55 100644
@@ -70,6 +70,7 @@ endif
 ifeq ($(BR2_STATIC_LIBS),y)
 ROCKSDB_BUILD_TARGETS += static_lib
 ROCKSDB_INSTALL_TARGETS += install-static
+ROCKSDB_EXTRA_CXXFLAGS += -DROCKSDB_NO_DYNAMIC_EXTENSION
 else ifeq ($(BR2_SHARED_LIBS),y)
 ROCKSDB_BUILD_TARGETS += shared_lib
 ROCKSDB_INSTALL_TARGETS += install-shared
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/2 package/rocksdb: fix build without dlfcn.h

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Fixes:
- http://autobuild.buildroot.org/results/04c5afff034d8d71d11b95c998e3156292852de6

Committed to 2020.02.x, thanks.

Quoted 23 lines
---
 package/rocksdb/rocksdb.mk | 1 +
 1 file changed, 1 insertion(+)
package/rocksdb/rocksdb.mk +1 -0
index 86732ad46c..31a9f98b55 100644
@@ -70,6 +70,7 @@ endif
 ifeq ($(BR2_STATIC_LIBS),y)
 ROCKSDB_BUILD_TARGETS += static_lib
 ROCKSDB_INSTALL_TARGETS += install-static
+ROCKSDB_EXTRA_CXXFLAGS += -DROCKSDB_NO_DYNAMIC_EXTENSION
 else ifeq ($(BR2_SHARED_LIBS),y)
 ROCKSDB_BUILD_TARGETS += shared_lib
 ROCKSDB_INSTALL_TARGETS += install-shared
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/2 package/rocksdb: fix build on m68k_cf

In reply to Fabrice Fontaine
Quoted 7 lines · On Sat, 28 Mar 2020 16:58:28 +0100 Fabrice Fontaine…

Fixes:
- http://autobuild.buildroot.org/results/04c5afff034d8d71d11b95c998e3156292852de6

---
 package/rocksdb/rocksdb.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

Both applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com