jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 06:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

zmqpp: bmp to version 4.1.2

Browse Source 
Drop 0001-add-cstdlib-header-to-ensure-EXIT_FAILURE-presence.patch since
it's already upstream.

Rebase shared/static build patches - these look unnecessary if we switch
to cmake-package, however it seems to require the zmq package switches
to cmake-package as well since static library naming looks different,
which might be a problem for users.

Also set the minimum required version of gcc to 4.7.x since the code now
requires c++1x.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Gustavo Zacarias 2016-02-24 14:38:48 -03:00 committed by Thomas Petazzoni
parent 8461038f8d
commit bef1592296
6 changed files with 45 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
package/zmqpp/0002-Allow-building-shared-or-static-library-only.patch → package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch
View File

@ -1,42 +1,43 @@
From 4c83dd96d1f92627ecdb6b6ed80b8c278aea82f7 Mon Sep 17 00:00:00 2001 From 02ad67e60ef698ee47f6ee53b36e5b89c2fd71e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks> From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
Date: Fri, 20 Nov 2015 19:51:50 +0100 Date: Wed, 24 Feb 2016 10:07:11 -0300
Subject: [PATCH] Allow building shared or static library only Subject: [PATCH 1/2] Allow building shared or static library only
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
[Gustavo: update for 4.1.2]
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
--- ---
Makefile | 19 ++++++++++++++++--- Makefile | 19 +++++++++++++++----
1 file changed, 16 insertions(+), 3 deletions(-) 1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 7d63077..90c7059 100644 index 9df5996..86c8fac 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -57,6 +57,9 @@ LIBRARY_ARCHIVE = lib$(LIBRARY_NAME).a @@ -79,6 +79,8 @@ ifeq ($(UNAME_S),Darwin)
CLIENT_TARGET = $(LIBRARY_NAME) endif
TESTS_TARGET = $(LIBRARY_NAME)-tests
+BUILD_SHARED ?= yes
+BUILD_SHARED ?= yes +BUILD_SHARED ?= yes
+ +
CONFIG_FLAGS = CONFIG_FLAGS =
ifeq ($(CONFIG),debug) ifeq ($(CONFIG),debug)
CONFIG_FLAGS = -g -fno-inline -ftemplate-depth-1000 CONFIG_FLAGS = -g -fno-inline -ftemplate-depth-1000
@@ -71,7 +74,7 @@ ifneq (,$(findstring $(CONFIG),release loadtest)) @@ -93,13 +95,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 CONFIG_FLAGS = -O3 -funroll-loops -ffast-math -finline-functions -fomit-frame-pointer -DNO_DEBUG_LOG -DNO_TRACE_LOG -DNDEBUG
endif endif
-COMMON_FLAGS = -MMD -std=c++0x -pipe -Wall -fPIC \ -COMMON_FLAGS = -MMD -std=c++11 -pipe -Wall -fPIC \
+COMMON_FLAGS = -MMD -std=c++0x -pipe -Wall \ +COMMON_FLAGS = -MMD -std=c++11 -pipe -Wall \
-DBUILD_ENV=$(CONFIG) \ -DBUILD_ENV=$(CONFIG) \
-DBUILD_VERSION='"$(APP_VERSION)"' \ -DBUILD_DATESTAMP='$(APP_DATESTAMP)' \
-DBUILD_VERSION_MAJOR=$(VERSION_MAJOR) \ -DBUILD_LIBRARY_NAME='"$(LIBRARY_NAME)"' \
@@ -82,6 +85,15 @@ COMMON_FLAGS = -MMD -std=c++0x -pipe -Wall -fPIC \
-DBUILD_CLIENT_NAME='"$(CLIENT_TARGET)"' \ -DBUILD_CLIENT_NAME='"$(CLIENT_TARGET)"' \
-I$(SRC_PATH) -I$(SRC_PATH) $(CUSTOM_INCLUDE_PATH)
+ifeq ($(BUILD_SHARED),yes) +ifeq ($(BUILD_SHARED),yes)
+COMMON_FLAGS += -fPIC +COMMON_FLAGS += -fPIC
@ -49,20 +50,21 @@ index 7d63077..90c7059 100644
+ +
COMMON_LIBS = -lzmq COMMON_LIBS = -lzmq
LIBRARY_LIBS = LIBRARY_LIBS =
@@ -125,9 +137,11 @@ check: $(LIBRARY_SHARED) $(LIBRARY_ARCHIVE) test @@ -147,10 +158,11 @@ install:
mkdir -p $(INCLUDEDIR)/$(LIBRARY_DIR)
install: mkdir -p $(LIBDIR)
install -m 644 $(ALL_LIBRARY_INCLUDES) $(INCLUDEDIR)/$(LIBRARY_DIR) install -m 644 $(ALL_LIBRARY_INCLUDES) $(INCLUDEDIR)/$(LIBRARY_DIR)
+ifeq ($(BUILD_SHARED),yes) +ifeq ($(BUILD_SHARED),yes)
install -m 755 $(BUILD_PATH)/$(LIBRARY_SHARED).$(VERSION_MAJOR) $(LIBDIR)/$(LIBRARY_SHARED).$(APP_VERSION) install -m 755 $(BUILD_PATH)/$(LIBRARY_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_FULL_VERSION_SHARED)
ln -sf $(LIBRARY_SHARED).$(APP_VERSION) $(LIBDIR)/$(LIBRARY_SHARED).$(VERSION_MAJOR) - install -m 755 $(BUILD_PATH)/$(LIBRARY_ARCHIVE) $(LIBDIR)/$(LIBRARY_ARCHIVE)
ln -sf $(LIBRARY_SHARED).$(APP_VERSION) $(LIBDIR)/$(LIBRARY_SHARED) ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_VERSION_SHARED)
ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_SHARED)
+endif +endif
if [ -f $(BUILD_PATH)/$(CLIENT_TARGET) ]; then install -m 755 $(BUILD_PATH)/$(CLIENT_TARGET) $(BINDIR); fi if [ -f $(BUILD_PATH)/$(CLIENT_TARGET) ]; then install -m 755 $(BUILD_PATH)/$(CLIENT_TARGET) $(BINDIR); fi
$(LDCONFIG) $(LDCONFIG)
@echo "use make installcheck to test the install" @echo "use make installcheck to test the install"
@@ -148,7 +162,7 @@ clean: @@ -172,7 +184,7 @@ clean:
client: $(CLIENT_TARGET) client: $(CLIENT_TARGET)
@ -71,11 +73,11 @@ index 7d63077..90c7059 100644
# #
# BUILD Targets # BUILD Targets
@@ -187,4 +201,3 @@ test: $(TESTS_TARGET) @@ -211,4 +223,3 @@ test: $(TESTS_TARGET)
$(OBJECT_PATH)/%.o: $(SRC_PATH)/%.cpp $(OBJECT_PATH)/%.o: $(SRC_PATH)/%.cpp
-mkdir -p $(dir $@) -mkdir -p $(dir $@)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(COMMON_FLAGS) $(CONFIG_FLAGS) -c -o $@ $< $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(COMMON_FLAGS) $(CONFIG_FLAGS) -c -o $@ $<
- -
-- --
2.6.2 2.4.10

30
package/zmqpp/0001-add-cstdlib-header-to-ensure-EXIT_FAILURE-presence.patch
View File

@ -1,30 +0,0 @@
From 2c9271fa662b98e2a451b859f2506edf5f91c9bf Mon Sep 17 00:00:00 2001
From: Lionel Orry <lionel.orry@gmail.com>
Date: Fri, 15 May 2015 11:27:57 +0200
Subject: [PATCH] add cstdlib header to ensure EXIT_FAILURE presence
Using some cross-compiling toolchains, EXIT_FAILURE is not always
properly defined without this inclusion.
Add myself to AUTHORS.
Signed-off-by: Lionel Orry <lionel.orry@gmail.com>
---
src/client/main.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/client/main.cpp b/src/client/main.cpp
index 082c06b..760f01a 100644
--- a/src/client/main.cpp
+++ b/src/client/main.cpp
@@ -3,6 +3,7 @@
* Author: @benjamg
*/
+#include <cstdlib>
#include <array>
#include <iostream>
#include <tuple>
--
2.1.0

17
package/zmqpp/0003-Install-static-library-for-static-builds.patch → package/zmqpp/0002-Install-static-library-for-static-builds.patch
View File

@ -1,23 +1,26 @@
From 1637443262cc861a161fd7c734bc0610a340335b Mon Sep 17 00:00:00 2001 From 283676e2e8f15bedca20c3d94caeecfdebe11ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks> From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
Date: Mon, 23 Nov 2015 22:53:09 +0100 Date: Mon, 23 Nov 2015 22:53:09 +0100
Subject: [PATCH] Install static library for static builds Subject: [PATCH 2/2] Install static library for static builds
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
[Gustavo: update for 4.1.2]
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
--- ---
Makefile | 3 +++ Makefile | 3 +++
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 90c7059..abed6fa 100644 index 86c8fac..fbaff63 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -142,6 +142,9 @@ ifeq ($(BUILD_SHARED),yes) @@ -163,6 +163,9 @@ ifeq ($(BUILD_SHARED),yes)
ln -sf $(LIBRARY_SHARED).$(APP_VERSION) $(LIBDIR)/$(LIBRARY_SHARED).$(VERSION_MAJOR) ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_VERSION_SHARED)
ln -sf $(LIBRARY_SHARED).$(APP_VERSION) $(LIBDIR)/$(LIBRARY_SHARED) ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_SHARED)
endif endif
+ifeq ($(BUILD_STATIC),yes) +ifeq ($(BUILD_STATIC),yes)
+ install -m 755 $(BUILD_PATH)/$(LIBRARY_ARCHIVE) $(LIBDIR)/$(LIBRARY_ARCHIVE) + install -m 755 $(BUILD_PATH)/$(LIBRARY_ARCHIVE) $(LIBDIR)/$(LIBRARY_ARCHIVE)
@ -26,5 +29,5 @@ index 90c7059..abed6fa 100644
$(LDCONFIG) $(LDCONFIG)
@echo "use make installcheck to test the install" @echo "use make installcheck to test the install"
-- --
2.6.2 2.4.10

8
package/zmqpp/Config.in
View File

@ -1,7 +1,7 @@
config BR2_PACKAGE_ZMQPP config BR2_PACKAGE_ZMQPP
bool "zmqpp" bool "zmqpp"
# c++0x support # c++1x support
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR # util-linux depends on BR2_USE_WCHAR # util-linux
depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
@ -14,9 +14,9 @@ config BR2_PACKAGE_ZMQPP
http://github.com/benjamg/zmqpp http://github.com/benjamg/zmqpp
comment "zmqpp needs a toolchain w/ C++, wchar, threads, gcc >= 4.6" comment "zmqpp needs a toolchain w/ C++, wchar, threads, gcc >= 4.7"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
if BR2_PACKAGE_ZMQPP if BR2_PACKAGE_ZMQPP

3
package/zmqpp/zmqpp.hash
View File

@ -1,3 +1,2 @@
# Locally calculated # Locally calculated
sha256 92cb5bf7e1df8b99792fe1eb530bf91fced9c2d14159007bec011bb1b8248269 zmqpp-3.2.0.tar.gz sha256 831ad02df64034268d910c30f9fb1b1e631ad810182951af9d7d622650831eb5 zmqpp-4.1.2.tar.gz
sha256 0b76169a48a0ba9dd581b63787b4852f3922de0c22b7a325cab688c1bafb3dd7 260a9304f6c74272bd3c396f6cca685657b4aff1.patch

4
package/zmqpp/zmqpp.mk
View File

@ -4,14 +4,12 @@
# #
################################################################################ ################################################################################
ZMQPP_VERSION = 3.2.0 ZMQPP_VERSION = 4.1.2
ZMQPP_SITE = $(call github,zeromq,zmqpp,$(ZMQPP_VERSION)) ZMQPP_SITE = $(call github,zeromq,zmqpp,$(ZMQPP_VERSION))
ZMQPP_INSTALL_STAGING = YES ZMQPP_INSTALL_STAGING = YES
ZMQPP_DEPENDENCIES = zeromq ZMQPP_DEPENDENCIES = zeromq
ZMQPP_LICENSE = MIT ZMQPP_LICENSE = MIT
ZMQPP_LICENSE_FILES = LICENSE 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_MAKE_OPTS = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr
ZMQPP_LDFLAGS = $(TARGET_LDFLAGS) -lpthread ZMQPP_LDFLAGS = $(TARGET_LDFLAGS) -lpthread