poco: fix & improve build

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 41 insertions, 13 deletions

diff --git a/patches/poco-1.4.1p1/poco-1.3.6p2-crosscompile.patch b/patches/poco-1.4.1p1/0001-make-Linux-configuration-crosscompile-aware.patch
index 5ca46fa9e..d454f8375 100644
--- a/patches/poco-1.4.1p1/poco-1.3.6p2-crosscompile.patch
+++ b/patches/poco-1.4.1p1/0001-make-Linux-configuration-crosscompile-aware.patch
@@ -1,5 +1,6 @@
 From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [patch] make Linux configuration crosscompile aware
+Date: Fri, 24 Jun 2011 21:21:27 +0200
+Subject: [PATCH] make Linux configuration crosscompile aware
 
 Currently, the "Linux" configuration cannot be cross compiled because
 the compiler is configured unconditionally. We add the CROSS_COMPILE
@@ -7,16 +8,15 @@ prefix: this way it is easily possible to overwrite that variable from
 the commandline and use any cross compiler.
 
 Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
 ---
- build/config/Linux |   10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ build/config/Linux |   17 +++++++++--------
+ 1 files changed, 9 insertions(+), 8 deletions(-)
 
-Index: poco-1.3.6p2/build/config/Linux
-===================================================================
---- poco-1.3.6p2.orig/build/config/Linux
-+++ poco-1.3.6p2/build/config/Linux
-@@ -15,14 +15,14 @@ LINKMODE = SHARED
+diff --git a/build/config/Linux b/build/config/Linux
+index 4781a12..1b3b3d2 100644
+--- a/build/config/Linux
++++ b/build/config/Linux
+@@ -15,14 +15,14 @@ LINKMODE ?= SHARED
  #
  # Define Tools
  #
@@ -36,3 +36,21 @@ Index: poco-1.3.6p2/build/config/Linux
  DEP     = $(POCO_BASE)/build/script/makedepend.gcc 
  SHELL   = sh
  RM      = rm -rf
+@@ -38,13 +38,14 @@ SHAREDLIBLINKEXT = .so
+ #
+ # Compiler and Linker Flags
+ #
+-CFLAGS          = 
++CFLAGS          = $(CPPFLAGS)
+ CFLAGS32        =
+ CFLAGS64        =
+-CXXFLAGS        = -Wall -Wno-sign-compare
++CXXFLAGS        = -Wall -Wno-sign-compare $(CPPFLAGS)
+ CXXFLAGS32      =
+ CXXFLAGS64      =
+-LINKFLAGS       =
++SHLIBFLAGS      = $(LDFLAGS)
++LINKFLAGS       = $(LDFLAGS)
+ LINKFLAGS32     =
+ LINKFLAGS64     =
+ STATICOPT_CC    =
diff --git a/patches/poco-1.4.1p1/series b/patches/poco-1.4.1p1/series
index dfb1c9ac9..5d1ef741a 100644
--- a/patches/poco-1.4.1p1/series
+++ b/patches/poco-1.4.1p1/series
@@ -1 +1,3 @@
-poco-1.3.6p2-crosscompile.patch
+# generated by git-ptx-patches
+0001-make-Linux-configuration-crosscompile-aware.patch
+# f2b60ed61ace06a43cc8c92a5e43d84c  - git-ptx-patches magic
diff --git a/rules/poco.in b/rules/poco.in
index d2688a006..9f947f4f6 100644
--- a/rules/poco.in
+++ b/rules/poco.in
@@ -8,6 +8,9 @@ config POCO
 	select LIBC_DL
 	select LIBC_RT
 	select LIBC_PTHREAD
+	select ZLIB
+	select LIBPCRE
+	select EXPAT
 	prompt "poco"
 	help
 	  The POCO C++ Libraries (POrtable COmponents) are open source C++ class
diff --git a/rules/poco.make b/rules/poco.make
index e306e2c4f..3f536ef3c 100644
--- a/rules/poco.make
+++ b/rules/poco.make
@@ -36,10 +36,15 @@ POCO_CONF_OPT	:= \
 	--no-tests \
 	--no-samples \
 	--omit=Data/MySQL,Data/ODBC,Zip \
-	--poquito
+	--poquito \
+	--unbundled \
+	--shared
 
-POCO_MAKE_OPT	:= \
-	CROSS_COMPILE=$(PTXCONF_COMPILER_PREFIX)
+POCO_MAKE_ENV	:= \
+	$(CROSS_ENV) \
+	CROSS_COMPILE=$(PTXCONF_COMPILER_PREFIX) \
+	POCO_TARGET_OSNAME=Linux \
+	POCO_TARGET_OSARCH=$(PTXCONF_ARCH_STRING)
 
 # ----------------------------------------------------------------------------
 # Target-Install