1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192 |
- From 93005632eca13d8eda409f6e9496fd5dd69e75b0 Mon Sep 17 00:00:00 2001
- From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
- Date: Fri, 4 May 2018 18:38:31 +0200
- Subject: [PATCH] Allow building shared or static library only
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- Patchs retrieved from:
- - https://git.buildroot.net/buildroot/tree/package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch
- - https://git.buildroot.net/buildroot/tree/package/zmqpp/0002-Install-static-library-for-static-builds.patch
- Both patches have been merged in a single one and slightly updated to
- keep default behavior of building and installing static library
- (BUILD_STATIC is set to yes by default)
- [Upstream status: merged (https://github.com/zeromq/zmqpp/pull/218)]
- Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
- Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
- Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
- ---
- Makefile | 24 ++++++++++++++++++++----
- 1 file changed, 20 insertions(+), 4 deletions(-)
- diff --git a/Makefile b/Makefile
- index 689acaa..e43054c 100644
- --- a/Makefile
- +++ b/Makefile
- @@ -81,6 +81,9 @@ ifeq ($(UNAME_S),Darwin)
- endif
-
-
- +BUILD_SHARED ?= yes
- +BUILD_STATIC ?= yes
- +
- CONFIG_FLAGS =
- ifeq ($(CONFIG),debug)
- CONFIG_FLAGS = -g -fno-inline -ftemplate-depth-1000
- @@ -95,13 +98,22 @@ 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++11 -pipe -Wall -fPIC \
- +COMMON_FLAGS = -MMD -std=c++11 -pipe -Wall \
- -DBUILD_ENV=$(CONFIG) \
- -DBUILD_DATESTAMP='$(APP_DATESTAMP)' \
- -DBUILD_LIBRARY_NAME='"$(LIBRARY_NAME)"' \
- -DBUILD_CLIENT_NAME='"$(CLIENT_TARGET)"' \
- -I$(SRC_PATH) $(CUSTOM_INCLUDE_PATH)
-
- +ifeq ($(BUILD_SHARED),yes)
- +COMMON_FLAGS += -fPIC
- +LIBRARY_TARGETS += $(LIBRARY_SHARED)
- +endif
- +
- +ifeq ($(BUILD_STATIC),yes)
- +LIBRARY_TARGETS += $(LIBRARY_ARCHIVE)
- +endif
- +
- COMMON_LIBS = -lzmq
-
- LIBRARY_LIBS =
- @@ -150,11 +162,15 @@ install:
- mkdir -p $(LIBDIR)
- mkdir -p $(PKGCONFIGDIR)
- install -m 644 $(ALL_LIBRARY_INCLUDES) $(INCLUDEDIR)/$(LIBRARY_DIR)
- - install -m 755 $(BUILD_PATH)/$(LIBRARY_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_FULL_VERSION_SHARED)
- - install -m 755 $(BUILD_PATH)/$(LIBRARY_ARCHIVE) $(LIBDIR)/$(LIBRARY_ARCHIVE)
- install -m 755 $(BUILD_PATH)/$(PKGCONFIG_FILE) $(PKGCONFIGDIR)/$(PKGCONFIG_FILE)
- +ifeq ($(BUILD_SHARED),yes)
- + install -m 755 $(BUILD_PATH)/$(LIBRARY_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_FULL_VERSION_SHARED)
- ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_VERSION_SHARED)
- ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_SHARED)
- +endif
- +ifeq ($(BUILD_STATIC),yes)
- + install -m 755 $(BUILD_PATH)/$(LIBRARY_ARCHIVE) $(LIBDIR)/$(LIBRARY_ARCHIVE)
- +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"
- @@ -176,7 +192,7 @@ clean:
-
- client: $(CLIENT_TARGET)
-
- -library: $(LIBRARY_SHARED) $(LIBRARY_ARCHIVE)
- +library: $(LIBRARY_TARGETS)
-
- #
- # BUILD Targets
- --
- 2.14.1
|