From 56994e16ac98e6a145bd26a68da134e64821846f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sat, 13 Oct 2012 20:08:25 +0000 Subject: poco: bump to version 1.4.4 Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- .../poco/poco-1.4.2p1-add-cross-build-config.patch | 82 ---------------------- .../poco-1.4.2p1-add-staging-search-path.patch | 23 ------ .../poco/poco-1.4.2p1-dont-build-debug-libs.patch | 19 ----- package/poco/poco-add-cross-build-config.patch | 82 ++++++++++++++++++++++ package/poco/poco-add-staging-search-path.patch | 23 ++++++ package/poco/poco-dont-build-debug-libs.patch | 19 +++++ package/poco/poco.mk | 4 +- 7 files changed, 126 insertions(+), 126 deletions(-) delete mode 100644 package/poco/poco-1.4.2p1-add-cross-build-config.patch delete mode 100644 package/poco/poco-1.4.2p1-add-staging-search-path.patch delete mode 100644 package/poco/poco-1.4.2p1-dont-build-debug-libs.patch create mode 100644 package/poco/poco-add-cross-build-config.patch create mode 100644 package/poco/poco-add-staging-search-path.patch create mode 100644 package/poco/poco-dont-build-debug-libs.patch (limited to 'package') diff --git a/package/poco/poco-1.4.2p1-add-cross-build-config.patch b/package/poco/poco-1.4.2p1-add-cross-build-config.patch deleted file mode 100644 index a08783833..000000000 --- a/package/poco/poco-1.4.2p1-add-cross-build-config.patch +++ /dev/null @@ -1,82 +0,0 @@ -From: Baruch Siach -Subject: [PATCH] poco: add Linux configuration file for generic cross build - -This patch adds the Linux-CrossEnv config file to poco. This file is identical -to the Linux one, except the added CROSSENV variable that allows setting of -the toolchain prefix. - -Signed-off-by: Baruch Siach ---- -diff -Nuar poco-1.4.1p1-dist/build/config/Linux-CrossEnv poco-1.4.1p1/build/config/Linux-CrossEnv ---- poco-1.4.1p1-dist/build/config/Linux-CrossEnv 1970-01-01 02:00:00.000000000 +0200 -+++ poco-1.4.1p1/build/config/Linux-CrossEnv 2011-08-02 18:51:03.682047719 +0300 -@@ -0,0 +1,69 @@ -+# -+# Linux -+# -+# Make settings for cross compiled Linux -+# -+# -+ -+# -+# General Settings -+# -+LINKMODE ?= SHARED -+ -+# -+# Define Tools -+# -+CC = $(CROSSENV)gcc -+CXX = $(CROSSENV)g++ -+LINK = $(CXX) -+LIB = $(CROSSENV)ar -cr -+RANLIB = $(CROSSENV)ranlib -+SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@ -+SHLIBLN = $(POCO_BASE)/build/script/shlibln -+STRIP = $(CROSSENV)strip -+DEP = $(POCO_BASE)/build/script/makedepend.gcc -+SHELL = sh -+RM = rm -rf -+CP = cp -+MKDIR = mkdir -p -+ -+# -+# Extension for Shared Libraries -+# -+SHAREDLIBEXT = .so.$(target_version) -+SHAREDLIBLINKEXT = .so -+ -+# -+# Compiler and Linker Flags -+# -+CFLAGS = -+CFLAGS32 = -+CFLAGS64 = -+CXXFLAGS = -Wall -Wno-sign-compare -+CXXFLAGS32 = -+CXXFLAGS64 = -+LINKFLAGS = -+LINKFLAGS32 = -+LINKFLAGS64 = -+STATICOPT_CC = -+STATICOPT_CXX = -+STATICOPT_LINK = -static -+SHAREDOPT_CC = -fPIC -+SHAREDOPT_CXX = -fPIC -+SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH) -+DEBUGOPT_CC = -g -D_DEBUG -+DEBUGOPT_CXX = -g -D_DEBUG -+DEBUGOPT_LINK = -g -+RELEASEOPT_CC = -O2 -DNDEBUG -+RELEASEOPT_CXX = -O2 -DNDEBUG -+RELEASEOPT_LINK = -O2 -+ -+# -+# System Specific Flags -+# -+SYSFLAGS = -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DPOCO_HAVE_FD_EPOLL -+ -+# -+# System Specific Libraries -+# -+SYSLIBS = -lpthread -ldl -lrt diff --git a/package/poco/poco-1.4.2p1-add-staging-search-path.patch b/package/poco/poco-1.4.2p1-add-staging-search-path.patch deleted file mode 100644 index 638ee2ad1..000000000 --- a/package/poco/poco-1.4.2p1-add-staging-search-path.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Baruch Siach -Subject: [PATCH] poco: add the staging path to search path - -Add the mysql headers and client libraries to the search path of the -preprocessor and the linker. The $MYSQL_LIBDIR / $MYSQL_INCIDR variables -must be set from the make command line. - -[Peter: Remove host dirs, add MYSQL_INCDIR] -Signed-off-by: Baruch Siach ---- ---- poco-1.4.1p1-all-dist/Data/MySQL/Makefile 2011-02-09 11:13:00.000000000 +0200 -+++ poco-1.4.1p1-all/Data/MySQL/Makefile 2011-08-07 09:03:37.106161274 +0300 -@@ -8,8 +8,8 @@ - - include $(POCO_BASE)/build/rules/global - --SYSLIBS += -L/usr/local/lib/mysql -L/usr/lib/mysql -L/usr/mysql/lib/mysql -L/usr/local/mysql/lib -lmysqlclient --INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql -I/usr/mysql/include/mysql -I/usr/local/mysql/include -+SYSLIBS += -L$(MYSQL_LIBDIR) -lmysqlclient -+INCLUDE += -I$(MYSQL_INCDIR) - SYSFLAGS += -DTHREADSAFE -DNO_TCL - - objects = Binder Extractor SessionImpl Connector \ diff --git a/package/poco/poco-1.4.2p1-dont-build-debug-libs.patch b/package/poco/poco-1.4.2p1-dont-build-debug-libs.patch deleted file mode 100644 index 748096372..000000000 --- a/package/poco/poco-1.4.2p1-dont-build-debug-libs.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Baruch Siach -Subject: [PATCH] poco: don't build debug libraries - -Remove the debug libraries build dependency from the default target. - -Signed-off-by: Baruch Siach ---- - ---- poco-1.4.1p1-dist/build/rules/compile 2011-02-09 11:12:24.000000000 +0200 -+++ poco-1.4.1p1/build/rules/compile 2011-08-03 07:51:42.946044176 +0300 -@@ -14,7 +14,7 @@ - - all: $(DEFAULT_TARGET) - all_static: static_debug static_release --all_shared: shared_debug shared_release -+all_shared: shared_release - all_debug: static_debug shared_debug - all_release: static_release shared_release - diff --git a/package/poco/poco-add-cross-build-config.patch b/package/poco/poco-add-cross-build-config.patch new file mode 100644 index 000000000..a08783833 --- /dev/null +++ b/package/poco/poco-add-cross-build-config.patch @@ -0,0 +1,82 @@ +From: Baruch Siach +Subject: [PATCH] poco: add Linux configuration file for generic cross build + +This patch adds the Linux-CrossEnv config file to poco. This file is identical +to the Linux one, except the added CROSSENV variable that allows setting of +the toolchain prefix. + +Signed-off-by: Baruch Siach +--- +diff -Nuar poco-1.4.1p1-dist/build/config/Linux-CrossEnv poco-1.4.1p1/build/config/Linux-CrossEnv +--- poco-1.4.1p1-dist/build/config/Linux-CrossEnv 1970-01-01 02:00:00.000000000 +0200 ++++ poco-1.4.1p1/build/config/Linux-CrossEnv 2011-08-02 18:51:03.682047719 +0300 +@@ -0,0 +1,69 @@ ++# ++# Linux ++# ++# Make settings for cross compiled Linux ++# ++# ++ ++# ++# General Settings ++# ++LINKMODE ?= SHARED ++ ++# ++# Define Tools ++# ++CC = $(CROSSENV)gcc ++CXX = $(CROSSENV)g++ ++LINK = $(CXX) ++LIB = $(CROSSENV)ar -cr ++RANLIB = $(CROSSENV)ranlib ++SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@ ++SHLIBLN = $(POCO_BASE)/build/script/shlibln ++STRIP = $(CROSSENV)strip ++DEP = $(POCO_BASE)/build/script/makedepend.gcc ++SHELL = sh ++RM = rm -rf ++CP = cp ++MKDIR = mkdir -p ++ ++# ++# Extension for Shared Libraries ++# ++SHAREDLIBEXT = .so.$(target_version) ++SHAREDLIBLINKEXT = .so ++ ++# ++# Compiler and Linker Flags ++# ++CFLAGS = ++CFLAGS32 = ++CFLAGS64 = ++CXXFLAGS = -Wall -Wno-sign-compare ++CXXFLAGS32 = ++CXXFLAGS64 = ++LINKFLAGS = ++LINKFLAGS32 = ++LINKFLAGS64 = ++STATICOPT_CC = ++STATICOPT_CXX = ++STATICOPT_LINK = -static ++SHAREDOPT_CC = -fPIC ++SHAREDOPT_CXX = -fPIC ++SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH) ++DEBUGOPT_CC = -g -D_DEBUG ++DEBUGOPT_CXX = -g -D_DEBUG ++DEBUGOPT_LINK = -g ++RELEASEOPT_CC = -O2 -DNDEBUG ++RELEASEOPT_CXX = -O2 -DNDEBUG ++RELEASEOPT_LINK = -O2 ++ ++# ++# System Specific Flags ++# ++SYSFLAGS = -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DPOCO_HAVE_FD_EPOLL ++ ++# ++# System Specific Libraries ++# ++SYSLIBS = -lpthread -ldl -lrt diff --git a/package/poco/poco-add-staging-search-path.patch b/package/poco/poco-add-staging-search-path.patch new file mode 100644 index 000000000..a9397b4f1 --- /dev/null +++ b/package/poco/poco-add-staging-search-path.patch @@ -0,0 +1,23 @@ +From: Baruch Siach +Subject: [PATCH] poco: add the staging path to search path + +Add the mysql headers and client libraries to the search path of the +preprocessor and the linker. The $MYSQL_LIBDIR / $MYSQL_INCIDR variables +must be set from the make command line. + +[Peter: Remove host dirs, add MYSQL_INCDIR] +Signed-off-by: Baruch Siach +--- +--- poco-1.4.4-all-dist/Data/MySQL/Makefile 2012-09-20 01:30:42.000000000 +0300 ++++ poco-1.4.4-all/Data/MySQL/Makefile 2012-10-11 14:36:10.343153420 +0200 +@@ -8,8 +8,8 @@ + + include $(POCO_BASE)/build/rules/global + +-SYSLIBS += -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient +-INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql -I/usr/mysql/include/mysql -I/usr/local/mysql/include ++SYSLIBS += -L$(MYSQL_LIBDIR) -lmysqlclient ++INCLUDE += -I$(MYSQL_INCDIR) + SYSFLAGS += -DTHREADSAFE -DNO_TCL + + objects = Binder Extractor SessionImpl Connector \ diff --git a/package/poco/poco-dont-build-debug-libs.patch b/package/poco/poco-dont-build-debug-libs.patch new file mode 100644 index 000000000..748096372 --- /dev/null +++ b/package/poco/poco-dont-build-debug-libs.patch @@ -0,0 +1,19 @@ +From: Baruch Siach +Subject: [PATCH] poco: don't build debug libraries + +Remove the debug libraries build dependency from the default target. + +Signed-off-by: Baruch Siach +--- + +--- poco-1.4.1p1-dist/build/rules/compile 2011-02-09 11:12:24.000000000 +0200 ++++ poco-1.4.1p1/build/rules/compile 2011-08-03 07:51:42.946044176 +0300 +@@ -14,7 +14,7 @@ + + all: $(DEFAULT_TARGET) + all_static: static_debug static_release +-all_shared: shared_debug shared_release ++all_shared: shared_release + all_debug: static_debug shared_debug + all_release: static_release shared_release + diff --git a/package/poco/poco.mk b/package/poco/poco.mk index eaa93e66c..942b9b2e6 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -3,8 +3,8 @@ # poco # ############################################################# -POCO_VERSION_MAJOR = 1.4.3 -POCO_VERSION = $(POCO_VERSION_MAJOR)p1 +POCO_VERSION_MAJOR = 1.4.4 +POCO_VERSION = $(POCO_VERSION_MAJOR) POCO_SOURCE = poco-$(POCO_VERSION)-all.tar.gz POCO_SITE = http://downloads.sourceforge.net/project/poco/sources/poco-$(POCO_VERSION_MAJOR) POCO_LICENSE = Boost-v1.0 -- cgit v1.2.3