summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--patches/poco-1.6.1/0001-libpcre-bug.patch12
-rw-r--r--patches/poco-1.6.1/0002-fix-parallel-building.patch57
-rw-r--r--patches/poco-1.6.1/0003-Include-pcre.h-for-an-unbundled-build.patch38
-rw-r--r--patches/poco-1.6.1/series3
-rw-r--r--patches/poco-1.9.0/0001-fix-parallel-building.patch57
-rw-r--r--patches/poco-1.9.0/series4
-rw-r--r--rules/poco.in82
-rw-r--r--rules/poco.make37
8 files changed, 164 insertions, 126 deletions
diff --git a/patches/poco-1.6.1/0001-libpcre-bug.patch b/patches/poco-1.6.1/0001-libpcre-bug.patch
deleted file mode 100644
index 97d5d05d2..000000000
--- a/patches/poco-1.6.1/0001-libpcre-bug.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Foundation/Makefile b/Foundation/Makefile
-index 45ade1c..895b575 100644
---- a/Foundation/Makefile
-+++ b/Foundation/Makefile
-@@ -46,6 +46,7 @@ pcre_utf8_objects = pcre_ucd pcre_tables
-
- ifdef POCO_UNBUNDLED
- SYSLIBS += -lpcre -lz
-+ objects += $(pcre_utf8_objects) # unicode.cpp uses internal pcre tables
- else
- objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)
- endif
diff --git a/patches/poco-1.6.1/0002-fix-parallel-building.patch b/patches/poco-1.6.1/0002-fix-parallel-building.patch
deleted file mode 100644
index a961e5acb..000000000
--- a/patches/poco-1.6.1/0002-fix-parallel-building.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 23 Oct 2012 07:32:47 +0200
-Subject: [PATCH] fix parallel building
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- build/rules/compile | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/build/rules/compile b/build/rules/compile
-index 1945e3c..59fca71 100644
---- a/build/rules/compile
-+++ b/build/rules/compile
-@@ -33,35 +33,35 @@ $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_SHARED) $(OB
- #
- # Rules for compiling
- #
--$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
-+$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d objdirs
- @echo "** Compiling" $< "(debug, static)"
- $(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
-
--$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
-+$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d objdirs
- @echo "** Compiling" $< "(release, static)"
- $(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
-
--$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
-+$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d objdirs
- @echo "** Compiling" $< "(debug, static)"
- $(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(STATICOPT_CC) -c $< -o $@
-
--$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
-+$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d objdirs
- @echo "** Compiling" $< "(release, static)"
- $(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(STATICOPT_CC) -c $< -o $@
-
--$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
-+$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d objdirs
- @echo "** Compiling" $< "(debug, shared)"
- $(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
-
--$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d
-+$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d objdirs
- @echo "** Compiling" $< "(release, shared)"
- $(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
-
--$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
-+$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d objdirs
- @echo "** Compiling" $< "(debug, shared)"
- $(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
-
--$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d
-+$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d objdirs
- @echo "** Compiling" $< "(release, shared)"
- $(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
-
diff --git a/patches/poco-1.6.1/0003-Include-pcre.h-for-an-unbundled-build.patch b/patches/poco-1.6.1/0003-Include-pcre.h-for-an-unbundled-build.patch
deleted file mode 100644
index b5d6b35df..000000000
--- a/patches/poco-1.6.1/0003-Include-pcre.h-for-an-unbundled-build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 94bb16fdeea5cd804c586b282cdbdd1c45360718 Mon Sep 17 00:00:00 2001
-From: zosrothko <zosrothko@orange.fr>
-Date: Tue, 17 Nov 2015 18:45:44 +0100
-Subject: [PATCH] Include <pcre.h> for an unbundled build.
-
----
- Foundation/include/Poco/RegularExpression.h | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/Foundation/include/Poco/RegularExpression.h b/Foundation/include/Poco/RegularExpression.h
-index 9181d29..e2b3446 100644
---- a/Foundation/include/Poco/RegularExpression.h
-+++ b/Foundation/include/Poco/RegularExpression.h
-@@ -28,17 +28,19 @@
- #include <map>
-
-
-+#ifdef POCO_UNBUNDLED
-+#include <pcre.h>
-+#else
- //
- // Copy these definitions from pcre.h
- // to avoid pulling in the entire header file
- //
- extern "C"
- {
-- struct real_pcre8_or_16; /* declaration; the definition is private */
- typedef struct real_pcre8_or_16 pcre;
- struct pcre_extra;
- }
--
-+#endif
-
- namespace Poco {
-
---
-2.1.4
-
diff --git a/patches/poco-1.6.1/series b/patches/poco-1.6.1/series
deleted file mode 100644
index ff8ef985a..000000000
--- a/patches/poco-1.6.1/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0001-libpcre-bug.patch
-0002-fix-parallel-building.patch
-0003-Include-pcre.h-for-an-unbundled-build.patch
diff --git a/patches/poco-1.9.0/0001-fix-parallel-building.patch b/patches/poco-1.9.0/0001-fix-parallel-building.patch
new file mode 100644
index 000000000..e5897fb1d
--- /dev/null
+++ b/patches/poco-1.9.0/0001-fix-parallel-building.patch
@@ -0,0 +1,57 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 5 Feb 2019 22:02:43 +0100
+Subject: [PATCH] fix parallel building
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ build/rules/compile | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/build/rules/compile b/build/rules/compile
+index f513434938fa..f52d4d2c2776 100644
+--- a/build/rules/compile
++++ b/build/rules/compile
+@@ -36,35 +36,35 @@ $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_SHARED) $(OB
+ #
+ # Rules for compiling
+ #
+-$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
++$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) | $(OBJPATH_DEBUG_STATIC)
+ @echo "** Compiling" $< "(debug, static)"
+ $(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
+
+-$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
++$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) | $(OBJPATH_RELEASE_STATIC)
+ @echo "** Compiling" $< "(release, static)"
+ $(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(STATICOPT_CXX) -c $< -o $@
+
+-$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
++$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) | $(OBJPATH_DEBUG_STATIC)
+ @echo "** Compiling" $< "(debug, static)"
+ $(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(STATICOPT_CC) -c $< -o $@
+
+-$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
++$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) | $(OBJPATH_RELEASE_STATIC)
+ @echo "** Compiling" $< "(release, static)"
+ $(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(STATICOPT_CC) -c $< -o $@
+
+-$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
++$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) | $(OBJPATH_DEBUG_SHARED)
+ @echo "** Compiling" $< "(debug, shared)"
+ $(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
+
+-$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
++$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) | $(OBJPATH_RELEASE_SHARED)
+ @echo "** Compiling" $< "(release, shared)"
+ $(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@
+
+-$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
++$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) | $(OBJPATH_DEBUG_SHARED)
+ @echo "** Compiling" $< "(debug, shared)"
+ $(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
+
+-$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG)
++$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) | $(OBJPATH_RELEASE_SHARED)
+ @echo "** Compiling" $< "(release, shared)"
+ $(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(SHAREDOPT_CC) -c $< -o $@
+
diff --git a/patches/poco-1.9.0/series b/patches/poco-1.9.0/series
new file mode 100644
index 000000000..c107fa32c
--- /dev/null
+++ b/patches/poco-1.9.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-fix-parallel-building.patch
+# 5cc5d42dfd5d2c4a2a35024d9a874950 - git-ptx-patches magic
diff --git a/rules/poco.in b/rules/poco.in
index 9f947f4f6..6f5afd804 100644
--- a/rules/poco.in
+++ b/rules/poco.in
@@ -1,18 +1,86 @@
## SECTION=system_libraries
-config POCO
+menuconfig POCO
tristate
select GCCLIBS_CXX
select GCCLIBS_GCC_S
- select LIBC_M
- select LIBC_DL
- select LIBC_RT
- select LIBC_PTHREAD
select ZLIB
select LIBPCRE
- select EXPAT
- prompt "poco"
+ select EXPAT if POCO_XML
+ select SQLITE if POCO_DATA_SQLITE
+ select MYSQLDB if POCO_DATA_MYSQL
+ select OPENSSL if POCO_CRYPTO
+ prompt "poco "
help
The POCO C++ Libraries (POrtable COmponents) are open source C++ class
libraries that simplify and accelerate the development of
network-centric, portable applications in C++.
+
+
+if POCO
+
+config POCO_ENCODINGS
+ bool
+ prompt "double-byte encodings library"
+
+config POCO_XML
+ bool
+ prompt "XML library"
+
+config POCO_JSON
+ bool
+ prompt "JSON library"
+
+config POCO_UTIL
+ bool
+ prompt "Util library"
+
+config POCO_NET
+ bool
+ prompt "Networking library"
+
+if POCO_NET && POCO_CRYPTO && POCO_UTIL
+
+config POCO_NETSSL_OPENSSL
+ bool
+ prompt "TLS using OpenSSL"
+
+endif
+
+config POCO_CRYPTO
+ bool
+ prompt "Crypto library"
+
+config POCO_DATA
+ bool
+ prompt "Database abstraction library"
+
+if POCO_DATA
+
+config POCO_DATA_SQLITE
+ bool
+ prompt "SQLite backend"
+
+config POCO_DATA_MYSQL
+ bool
+ prompt "MySQL backend"
+
+endif
+
+config POCO_ZIP
+ bool
+ prompt "Zip library"
+
+if POCO_NET
+
+config POCO_MONGODB
+ bool
+ prompt "MongoDB support"
+
+config POCO_REDIS
+ bool
+ prompt "Redis support"
+
+endif
+
+endif
diff --git a/rules/poco.make b/rules/poco.make
index e294e4b85..d280e08af 100644
--- a/rules/poco.make
+++ b/rules/poco.make
@@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_POCO) += poco
#
# Paths and names
#
-POCO_VERSION := 1.6.1
-POCO_MD5 := 8bc6b7dc22a8cbd97257028c02ac2707
+POCO_VERSION := 1.9.0
+POCO_MD5 := 9047586e0ba393bfeced96e3b7ae6286
POCO := poco-$(POCO_VERSION)
POCO_SUFFIX := tar.gz
-POCO_URL := http://pocoproject.org/releases/$(POCO)/$(POCO).$(POCO_SUFFIX)
+POCO_URL := http://pocoproject.org/releases/$(POCO)/$(POCO)-all.$(POCO_SUFFIX)
POCO_SOURCE := $(SRCDIR)/$(POCO).$(POCO_SUFFIX)
POCO_DIR := $(shell readlink -f "$(BUILDDIR)/$(POCO)")
POCO_LICENSE := BSL-1.0
@@ -29,13 +29,34 @@ POCO_LICENSE := BSL-1.0
# Prepare
# ----------------------------------------------------------------------------
+POCO_LIBS- := CppUnit
+POCO_LIBS- += CppUnit/WinTestRunner
+POCO_LIBS- += Data/ODBC
+POCO_LIBS- += PageCompiler
+POCO_LIBS- += PageCompiler/File2Page
+
+POCO_LIBS-y += Foundation
+POCO_LIBS-$(PTXCONF_POCO_ENCODINGS) += Encodings
+POCO_LIBS-$(PTXCONF_POCO_XML) += XML
+POCO_LIBS-$(PTXCONF_POCO_JSON) += JSON
+POCO_LIBS-$(PTXCONF_POCO_UTIL) += Util
+POCO_LIBS-$(PTXCONF_POCO_NET) += Net
+POCO_LIBS-$(PTXCONF_POCO_NETSSL_OPENSSL) += NetSSL_OpenSSL
+POCO_LIBS-$(PTXCONF_POCO_CRYPTO) += Crypto
+POCO_LIBS-$(PTXCONF_POCO_DATA) += Data
+POCO_LIBS-$(PTXCONF_POCO_DATA_SQLITE) += Data/SQLite
+POCO_LIBS-$(PTXCONF_POCO_DATA_MYSQL) += Data/MySQL
+POCO_LIBS-$(PTXCONF_POCO_ZIP) += Zip
+POCO_LIBS-$(PTXCONF_POCO_MONGODB) += MongoDB
+POCO_LIBS-$(PTXCONF_POCO_REDIS) += Redis
+
POCO_CONF_TOOL := autoconf
POCO_CONF_OPT := \
--config=Linux \
--prefix=/usr \
--no-tests \
--no-samples \
- --omit=Data/MySQL,Data/ODBC,Zip \
+ --omit=$(subst $(ptx/def/space),$(ptx/def/comma),$(POCO_LIBS-)) \
--poquito \
--unbundled \
--shared
@@ -59,11 +80,9 @@ $(STATEDIR)/poco.targetinstall:
@$(call install_fixup, poco,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
@$(call install_fixup, poco,DESCRIPTION,missing)
- @$(call install_lib, poco, 0, 0, 0644, libPocoUtil)
- @$(call install_lib, poco, 0, 0, 0644, libPocoXML)
- @$(call install_lib, poco, 0, 0, 0644, libPocoNet)
- @$(call install_lib, poco, 0, 0, 0644, libPocoFoundation)
- @$(call install_lib, poco, 0, 0, 0644, libPocoJSON)
+ @$(foreach lib, $(POCO_LIBS-y), \
+ $(call install_lib, poco, 0, 0, 0644, \
+ libPoco$(subst /,,$(subst _OpenSSL,,$(lib))));)
@$(call install_finish, poco)
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 10:18:13 +0000