1*4882a593SmuzhiyunFrom 93005632eca13d8eda409f6e9496fd5dd69e75b0 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Fri, 4 May 2018 18:38:31 +0200 4*4882a593SmuzhiyunSubject: [PATCH] Allow building shared or static library only 5*4882a593SmuzhiyunMIME-Version: 1.0 6*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8 7*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunPatchs retrieved from: 10*4882a593Smuzhiyun - https://git.buildroot.net/buildroot/tree/package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch 11*4882a593Smuzhiyun - https://git.buildroot.net/buildroot/tree/package/zmqpp/0002-Install-static-library-for-static-builds.patch 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunBoth patches have been merged in a single one and slightly updated to 14*4882a593Smuzhiyunkeep default behavior of building and installing static library 15*4882a593Smuzhiyun(BUILD_STATIC is set to yes by default) 16*4882a593Smuzhiyun 17*4882a593Smuzhiyun[Upstream status: merged (https://github.com/zeromq/zmqpp/pull/218)] 18*4882a593SmuzhiyunSigned-off-by: Jörg Krause <joerg.krause@embedded.rocks> 19*4882a593SmuzhiyunSigned-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> 20*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 21*4882a593Smuzhiyun--- 22*4882a593Smuzhiyun Makefile | 24 ++++++++++++++++++++---- 23*4882a593Smuzhiyun 1 file changed, 20 insertions(+), 4 deletions(-) 24*4882a593Smuzhiyun 25*4882a593Smuzhiyundiff --git a/Makefile b/Makefile 26*4882a593Smuzhiyunindex 689acaa..e43054c 100644 27*4882a593Smuzhiyun--- a/Makefile 28*4882a593Smuzhiyun+++ b/Makefile 29*4882a593Smuzhiyun@@ -81,6 +81,9 @@ ifeq ($(UNAME_S),Darwin) 30*4882a593Smuzhiyun endif 31*4882a593Smuzhiyun 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun+BUILD_SHARED ?= yes 34*4882a593Smuzhiyun+BUILD_STATIC ?= yes 35*4882a593Smuzhiyun+ 36*4882a593Smuzhiyun CONFIG_FLAGS = 37*4882a593Smuzhiyun ifeq ($(CONFIG),debug) 38*4882a593Smuzhiyun CONFIG_FLAGS = -g -fno-inline -ftemplate-depth-1000 39*4882a593Smuzhiyun@@ -95,13 +98,22 @@ ifneq (,$(findstring $(CONFIG),release loadtest)) 40*4882a593Smuzhiyun CONFIG_FLAGS = -O3 -funroll-loops -ffast-math -finline-functions -fomit-frame-pointer -DNO_DEBUG_LOG -DNO_TRACE_LOG -DNDEBUG 41*4882a593Smuzhiyun endif 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun-COMMON_FLAGS = -MMD -std=c++11 -pipe -Wall -fPIC \ 44*4882a593Smuzhiyun+COMMON_FLAGS = -MMD -std=c++11 -pipe -Wall \ 45*4882a593Smuzhiyun -DBUILD_ENV=$(CONFIG) \ 46*4882a593Smuzhiyun -DBUILD_DATESTAMP='$(APP_DATESTAMP)' \ 47*4882a593Smuzhiyun -DBUILD_LIBRARY_NAME='"$(LIBRARY_NAME)"' \ 48*4882a593Smuzhiyun -DBUILD_CLIENT_NAME='"$(CLIENT_TARGET)"' \ 49*4882a593Smuzhiyun -I$(SRC_PATH) $(CUSTOM_INCLUDE_PATH) 50*4882a593Smuzhiyun 51*4882a593Smuzhiyun+ifeq ($(BUILD_SHARED),yes) 52*4882a593Smuzhiyun+COMMON_FLAGS += -fPIC 53*4882a593Smuzhiyun+LIBRARY_TARGETS += $(LIBRARY_SHARED) 54*4882a593Smuzhiyun+endif 55*4882a593Smuzhiyun+ 56*4882a593Smuzhiyun+ifeq ($(BUILD_STATIC),yes) 57*4882a593Smuzhiyun+LIBRARY_TARGETS += $(LIBRARY_ARCHIVE) 58*4882a593Smuzhiyun+endif 59*4882a593Smuzhiyun+ 60*4882a593Smuzhiyun COMMON_LIBS = -lzmq 61*4882a593Smuzhiyun 62*4882a593Smuzhiyun LIBRARY_LIBS = 63*4882a593Smuzhiyun@@ -150,11 +162,15 @@ install: 64*4882a593Smuzhiyun mkdir -p $(LIBDIR) 65*4882a593Smuzhiyun mkdir -p $(PKGCONFIGDIR) 66*4882a593Smuzhiyun install -m 644 $(ALL_LIBRARY_INCLUDES) $(INCLUDEDIR)/$(LIBRARY_DIR) 67*4882a593Smuzhiyun- install -m 755 $(BUILD_PATH)/$(LIBRARY_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_FULL_VERSION_SHARED) 68*4882a593Smuzhiyun- install -m 755 $(BUILD_PATH)/$(LIBRARY_ARCHIVE) $(LIBDIR)/$(LIBRARY_ARCHIVE) 69*4882a593Smuzhiyun install -m 755 $(BUILD_PATH)/$(PKGCONFIG_FILE) $(PKGCONFIGDIR)/$(PKGCONFIG_FILE) 70*4882a593Smuzhiyun+ifeq ($(BUILD_SHARED),yes) 71*4882a593Smuzhiyun+ install -m 755 $(BUILD_PATH)/$(LIBRARY_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_FULL_VERSION_SHARED) 72*4882a593Smuzhiyun ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_VERSION_SHARED) 73*4882a593Smuzhiyun ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_SHARED) 74*4882a593Smuzhiyun+endif 75*4882a593Smuzhiyun+ifeq ($(BUILD_STATIC),yes) 76*4882a593Smuzhiyun+ install -m 755 $(BUILD_PATH)/$(LIBRARY_ARCHIVE) $(LIBDIR)/$(LIBRARY_ARCHIVE) 77*4882a593Smuzhiyun+endif 78*4882a593Smuzhiyun if [ -f $(BUILD_PATH)/$(CLIENT_TARGET) ]; then install -m 755 $(BUILD_PATH)/$(CLIENT_TARGET) $(BINDIR); fi 79*4882a593Smuzhiyun $(LDCONFIG) 80*4882a593Smuzhiyun @echo "use make installcheck to test the install" 81*4882a593Smuzhiyun@@ -176,7 +192,7 @@ clean: 82*4882a593Smuzhiyun 83*4882a593Smuzhiyun client: $(CLIENT_TARGET) 84*4882a593Smuzhiyun 85*4882a593Smuzhiyun-library: $(LIBRARY_SHARED) $(LIBRARY_ARCHIVE) 86*4882a593Smuzhiyun+library: $(LIBRARY_TARGETS) 87*4882a593Smuzhiyun 88*4882a593Smuzhiyun # 89*4882a593Smuzhiyun # BUILD Targets 90*4882a593Smuzhiyun-- 91*4882a593Smuzhiyun2.14.1 92*4882a593Smuzhiyun 93