package/zmqpp: add hash file
PATCH 1/3 package/zmqpp: add hash file
--- package/zmqpp/zmqpp.hash | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package/zmqpp/zmqpp.hash
package/zmqpp/zmqpp.hash new file +2 -0
@@ -0,0 +1,2 @@ +# Locally calculated +sha256 92cb5bf7e1df8b99792fe1eb530bf91fced9c2d14159007bec011bb1b8248269 zmqpp-3.2.0.tar.gz
Signature · 1 line
2.6.2
PATCH 2/3 package/zmqpp: add patch to fix build issue
Add a patch from upstream to fix build error:
error: no match for 'operator<<'
Fixes:
http://autobuild.buildroot.net/results/ed4508a00663b03632a4eb9411ba05852d02fd88/
--- package/zmqpp/zmqpp.hash | 1 + package/zmqpp/zmqpp.mk | 1 + 2 files changed, 2 insertions(+)
package/zmqpp/zmqpp.hash +1 -0
@@ -1,2 +1,3 @@ # Locally calculated sha256 92cb5bf7e1df8b99792fe1eb530bf91fced9c2d14159007bec011bb1b8248269 zmqpp-3.2.0.tar.gz +sha256 0b76169a48a0ba9dd581b63787b4852f3922de0c22b7a325cab688c1bafb3dd7 260a9304f6c74272bd3c396f6cca685657b4aff1.patch
package/zmqpp/zmqpp.mk +1 -0
@@ -10,6 +10,7 @@ ZMQPP_INSTALL_STAGING = YES ZMQPP_DEPENDENCIES = zeromq ZMQPP_LICENSE = MIT ZMQPP_LICENSE_FILES = LICENSE +ZMQPP_PATCH = https://github.com/zeromq/zmqpp/commit/260a9304f6c74272bd3c396f6cca685657b4aff1.patch ZMQPP_MAKE_OPTS = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr ZMQPP_LDFLAGS = $(TARGET_LDFLAGS) -lpthread
Signature · 1 line
2.6.2
Thomas Petazzoni
AppliedPATCH 2/3 package/zmqpp: add patch to fix build issue
Dear J?rg Krause,
Quoted 11 lines · J?rg Krause
Add a patch from upstream to fix build error:
error: no match for 'operator<<'Fixes:
http://autobuild.buildroot.net/results/ed4508a00663b03632a4eb9411ba05852d02fd88/Signed-off-by J?rg Krause <[email protected]>--- package/zmqpp/zmqpp.hash | 1 + package/zmqpp/zmqpp.mk | 1 + 2 files changed, 2 insertions(+)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 3/3 package/zmqpp: fix static build issues
In reply to Jörg KrauseThe Makefile for zmqpp builds both shared and static libraries and the client binary. This leads to several build issues in pure static library contexts:
* R_ARM_TLS_LE32 relocation not permitted in shared object
* relocation R_ARC_32_ME against `_ZSt7nothrow' can not be used when making a shared object; recompile with -fPIC
We add a minimal patch to add some basic handling of building a shared or a static library only.
Additionally, disable the client for static only builds.
Fixes:
http://autobuild.buildroot.net/results/345/345771eb488c60585e388fbbf4490df936e88e19/
http://autobuild.buildroot.net/results/21b/21b6912c70a5c300bdabde53bee6a1d9cc3bbb02/
http://autobuild.buildroot.net/results/d98/d9882d2ba00da16f76cea6d86a84cd4815ebbba2/
--- ...imal-support-for-disabling-shared-library.patch | 75 ++++++++++++++++++++++ package/zmqpp/Config.in | 5 +- package/zmqpp/zmqpp.mk | 6 +- 3 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 package/zmqpp/0002-Add-minimal-support-for-disabling-shared-library.patch
package/zmqpp/0002-Add-minimal-support-for-disabling-shared-library.patch new file +75 -0
@@ -0,0 +1,75 @@ +From 547d707370c128f223a6147de6b012a83a9fc3f3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= <[email protected]> +Date: Fri, 20 Nov 2015 19:51:50 +0100 +Subject: [PATCH 2/2] Add minimal support for disabling shared library +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: J?rg Krause <[email protected]> +--- + Makefile | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 7d63077..2e9aed3 100644 +--- a/Makefile ++++ b/Makefile +@@ -71,7 +71,7 @@ ifneq (,$(findstring $(CONFIG),release loadtest)) + CONFIG_FLAGS = -O3 -funroll-loops -ffast-math -finline-functions -fomit-frame-pointer -DNO_DEBUG_LOG -DNO_TRACE_LOG -DNDEBUG + endif + +-COMMON_FLAGS = -MMD -std=c++0x -pipe -Wall -fPIC \ ++COMMON_FLAGS = -MMD -std=c++0x -pipe -Wall \ + -DBUILD_ENV=$(CONFIG) \ + -DBUILD_VERSION='"$(APP_VERSION)"' \ + -DBUILD_VERSION_MAJOR=$(VERSION_MAJOR) \ +@@ -82,6 +82,10 @@ COMMON_FLAGS = -MMD -std=c++0x -pipe -Wall -fPIC \ + -DBUILD_CLIENT_NAME='"$(CLIENT_TARGET)"' \ + -I$(SRC_PATH) + ++ifeq ($(BUILD_SHARED),yes) ++COMMON_FLAGS += -fPIC ++endif ++ + COMMON_LIBS = -lzmq + + LIBRARY_LIBS = +@@ -125,9 +129,11 @@ check: $(LIBRARY_SHARED) $(LIBRARY_ARCHIVE) test + + install: + install -m 644 $(ALL_LIBRARY_INCLUDES) $(INCLUDEDIR)/$(LIBRARY_DIR) ++ifeq ($(BUILD_SHARED),yes) + install -m 755 $(BUILD_PATH)/$(LIBRARY_SHARED).$(VERSION_MAJOR) $(LIBDIR)/$(LIBRARY_SHARED).$(APP_VERSION) + ln -sf $(LIBRARY_SHARED).$(APP_VERSION) $(LIBDIR)/$(LIBRARY_SHARED).$(VERSION_MAJOR) + ln -sf $(LIBRARY_SHARED).$(APP_VERSION) $(LIBDIR)/$(LIBRARY_SHARED) ++endif + if [ -f $(BUILD_PATH)/$(CLIENT_TARGET) ]; then install -m 755 $(BUILD_PATH)/$(CLIENT_TARGET) $(BINDIR); fi + $(LDCONFIG) + @echo "use make installcheck to test the install" +@@ -148,7 +154,7 @@ clean: + + client: $(CLIENT_TARGET) + +-library: $(LIBRARY_SHARED) $(LIBRARY_ARCHIVE) ++library: $(if $(BUILD_SHARED),$(LIBRARY_SHARED)) $(LIBRARY_ARCHIVE) + + # + # BUILD Targets +@@ -160,7 +166,7 @@ $(LIBRARY_SHARED): $(ALL_LIBRARY_OBJECTS) + $(LIBRARY_ARCHIVE): $(ALL_LIBRARY_OBJECTS) + $(AR) crf $(BUILD_PATH)/$@ $^ + +-$(CLIENT_TARGET): $(LIBRARY_SHARED) $(LIBRARY_ARCHIVE) $(ALL_CLIENT_OBJECTS) ++$(CLIENT_TARGET): $(if $(BUILD_SHARED),$(LIBRARY_SHARED)) $(LIBRARY_ARCHIVE) $(ALL_CLIENT_OBJECTS) + $(LD) $(LDFLAGS) -o $(BUILD_PATH)/$@ $(ALL_CLIENT_OBJECTS) $(CLIENT_LIBS) $(COMMON_LIBS) + + $(TESTS_TARGET): $(LIBRARY_SHARED) $(LIBRARY_ARCHIVE) $(ALL_TEST_OBJECTS) +@@ -187,4 +193,3 @@ test: $(TESTS_TARGET) + $(OBJECT_PATH)/%.o: $(SRC_PATH)/%.cpp + -mkdir -p $(dir $@) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(COMMON_FLAGS) $(CONFIG_FLAGS) -c -o $@ $< +- +-- +2.6.2 +
package/zmqpp/Config.in +3 -2
@@ -22,6 +22,7 @@ if BR2_PACKAGE_ZMQPP config BR2_PACKAGE_ZMQPP_CLIENT bool "zmqpp client" + depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS # boost depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS select BR2_PACKAGE_BOOST
@@ -30,8 +31,8 @@ config BR2_PACKAGE_ZMQPP_CLIENT Build and install the zmqpp client, a command line tool that can be used to listen or send to zeromq sockets. -comment "zmqpp client needs a toolchain w/ threads" +comment "zmqpp client needs a toolchain w/ dynamic library, threads" depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS endif
package/zmqpp/zmqpp.mk +5 -1
@@ -19,10 +19,14 @@ ifeq ($(BR2_PACKAGE_ZMQPP_CLIENT),y) ZMQPP_DEPENDENCIES += boost endif +ifeq ($(BR2_SHARED_LIBS),y) +TARGET_CONFIGURE_OPTS += BUILD_SHARED=yes +endif + define ZMQPP_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ LDFLAGS="$(ZMQPP_LDFLAGS)" \ - $(ZMQPP_MAKE_OPTS) $(if $(BR2_PACKAGE_ZMQPP_CLIENT),all) -C $(@D) + $(ZMQPP_MAKE_OPTS) $(if $(BR2_PACKAGE_ZMQPP_CLIENT),client,library) -C $(@D) endef define ZMQPP_INSTALL_TARGET_CMDS
Signature · 1 line
2.6.2
PATCH 3/3 package/zmqpp: fix static build issues
J?rg,
Quoted 29 lines · J?rg Krause
package/zmqpp/0002-Add-minimal-support-for-disabling-shared-library.patch new file +23
-0@@ -0,0 +1,75 @@ +From 547d707370c128f223a6147de6b012a83a9fc3f3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= <[email protected]> +Date: Fri, 20 Nov 2015 19:51:50 +0100 +Subject: [PATCH 2/2] Add minimal support for disabling shared library +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: J?rg Krause <[email protected]> +--- + Makefile | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 7d63077..2e9aed3 100644 +--- a/Makefile ++++ b/Makefile +@@ -71,7 +71,7 @@ ifneq (,$(findstring $(CONFIG),release loadtest)) + CONFIG_FLAGS = -O3 -funroll-loops -ffast-math -finline-functions -fomit-frame-pointer -DNO_DEBUG_LOG -DNO_TRACE_LOG -DNDEBUG + endif + +-COMMON_FLAGS = -MMD -std=c++0x -pipe -Wall -fPIC \ ++COMMON_FLAGS = -MMD -std=c++0x -pipe -Wall \
package/zmqpp/0002-Add-minimal-support-for-disabling-shared-library.patch line 33
Quoted 10 lines
package/zmqpp/0002-Add-minimal-support-for-disabling-shared-library.patch new file +10
-0+ -DBUILD_ENV=$(CONFIG) \ + -DBUILD_VERSION='"$(APP_VERSION)"' \ + -DBUILD_VERSION_MAJOR=$(VERSION_MAJOR) \ +@@ -82,6 +82,10 @@ COMMON_FLAGS = -MMD -std=c++0x -pipe -Wall -fPIC \ + -DBUILD_CLIENT_NAME='"$(CLIENT_TARGET)"' \ + -I$(SRC_PATH) + ++ifeq ($(BUILD_SHARED),yes) ++COMMON_FLAGS += -fPIC ++endif
I think the approach is probably OK, but in order for the patch to be potentially acceptable upstream, it should preserve the existing behavior. This means that by default, both the static and shared variants should be built, so you should probably no:
BUILD_SHARED ?= yes
in the Makefile. And then, in the package .mk file, explicitly pass BUILD_SHARED=no or BUILD_SHARED=yes depending on BR2_STATIC_LIBS.
package/zmqpp/0002-Add-minimal-support-for-disabling-shared-library.patch line 36
Quoted 3 lines
package/zmqpp/0002-Add-minimal-support-for-disabling-shared-library.patch new file +3
-0+ifeq ($(BR2_SHARED_LIBS),y) +TARGET_CONFIGURE_OPTS += BUILD_SHARED=yes +endif
This is not good since we also want the shared library in the BR2_SHARED_STATIC_LIBS case.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
Thomas Petazzoni
AppliedPATCH 1/3 package/zmqpp: add hash file
In reply to Jörg KrauseDear J?rg Krause,
Quoted 5 lines · J?rg Krause
Signed-off-by J?rg Krause <[email protected]>--- package/zmqpp/zmqpp.hash | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package/zmqpp/zmqpp.hash
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com