Re: [ptxdist] [PATCH] poco: version bump 1.6.1 -> 1.9.0

["Baeuerle, Florian" <Florian.Baeuerle@allegion.com>]

NAK,

I totally missed the targetinstall section, and also the defaults are screwed up

- Florian
Am Montag, den 04.02.2019, 11:22 +0000 schrieb Baeuerle, Florian:
> And make poco more configurable.
> 
> Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
> ---
>  patches/poco-1.6.1/0001-libpcre-bug.patch     | 12 ---
>  .../0002-fix-parallel-building.patch          | 57 ------------
>  ...nclude-pcre.h-for-an-unbundled-build.patch | 38 --------
>  patches/poco-1.6.1/series                     |  3 -
>  rules/poco.in                                 | 93 +++++++++++++++++--
>  rules/poco.make                               | 62 ++++++++++++-
>  6 files changed, 145 insertions(+), 120 deletions(-)
>  delete mode 100644 patches/poco-1.6.1/0001-libpcre-bug.patch
>  delete mode 100644 patches/poco-1.6.1/0002-fix-parallel-building.patch
>  delete mode 100644 patches/poco-1.6.1/0003-Include-pcre.h-for-an-unbundled-
> build.patch
>  delete mode 100644 patches/poco-1.6.1/series
> 
> 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/rules/poco.in b/rules/poco.in
> index 9f947f4f6..877dd2f46 100644
> --- a/rules/poco.in
> +++ b/rules/poco.in
> @@ -1,18 +1,99 @@
>  ## 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
> +	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_CPPUNIT
> +	bool
> +	default n
> +	prompt "bundled CppUnit"
> +
> +config POCO_ENCODINGS
> +	bool
> +	default n
> +	prompt "double-byte encodings library"
> +
> +config POCO_XML
> +	bool
> +	default y
> +	prompt "XML library"
> +
> +config POCO_UTIL
> +	bool
> +	default y
> +	prompt "Util library"
> +
> +config POCO_NET
> +	bool
> +	default y
> +	prompt "Networking library"
> +
> +if POCO_NET && POCO_CRYPTO && POCO_UTIL
> +
> +config POCO_NETSSL_OPENSSL
> +	bool
> +	default y
> +	prompt "TLS using OpenSSL"
> +
> +endif
> +
> +config POCO_CRYPTO
> +	bool
> +	default n
> +	prompt "Crypto library"
> +
> +config POCO_DATA
> +	bool
> +	default n
> +	prompt "Database abstraction library"
> +
> +if POCO_DATA
> +
> +config POCO_DATA_SQLITE
> +	bool
> +	default n
> +	prompt "SQLite backend"
> +
> +config POCO_DATA_MYSQL
> +	bool
> +	default n
> +	prompt "MySQL backend"
> +
> +endif
> +
> +config POCO_ZIP
> +	bool
> +	default n
> +	prompt "Zip library"
> +
> +if POCO_NET
> +
> +config POCO_MONGODB
> +	bool
> +	default n
> +	prompt "MongoDB support"
> +
> +config POCO_REDIS
> +	bool
> +	default n
> +	prompt "Redis support"
> +
> +endif
> +
> +endif
> diff --git a/rules/poco.make b/rules/poco.make
> index e294e4b85..7d27b22ca 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,67 @@ POCO_LICENSE	:= BSL-1.0
>  # Prepare
>  # -------------------------------------------------------------------------
> ---
>  
> +POCO_CONF_OPT_OMIT = Data/ODBC PageCompiler PageCompiler/File2Page
> CppUnit/WinTestRunner
> +
> +ifndef PTXCONF_POCO_CPPUNIT
> +POCO_CONF_OPT_OMIT += CppUnit
> +endif
> +
> +ifndef PTXCONF_POCO_ENCODINGS
> +POCO_CONF_OPT_OMIT += Encodings
> +endif
> +
> +ifndef PTXCONF_POCO_XML
> +POCO_CONF_OPT_OMIT += XML
> +endif
> +
> +ifndef PTXCONF_POCO_JSON
> +POCO_CONF_OPT_OMIT += JSON
> +endif
> +
> +ifndef PTXCONF_POCO_UTIL
> +POCO_CONF_OPT_OMIT += Util
> +endif
> +
> +ifndef PTXCONF_POCO_NET
> +POCO_CONF_OPT_OMIT += Net
> +endif
> +
> +ifndef PTXCONF_POCO_NETSSL_OPENSSL
> +POCO_CONF_OPT_OMIT += NetSSL_OpenSSL
> +endif
> +
> +ifndef PTXCONF_POCO_DATA
> +POCO_CONF_OPT_OMIT += Data
> +endif
> +
> +ifndef PTXCONF_POCO_DATA_SQLITE
> +POCO_CONF_OPT_OMIT += Data/SQLite
> +endif
> +
> +ifndef PTXCONF_POCO_DATA_MYSQL
> +POCO_CONF_OPT_OMIT += Data/MySQL
> +endif
> +
> +ifndef PTXCONF_POCO_ZIP
> +POCO_CONF_OPT_OMIT += Zip
> +endif
> +
> +ifndef PTXCONF_POCO_MONGODB
> +POCO_CONF_OPT_OMIT += MongoDB
> +endif
> +
> +ifndef PTXCONF_POCO_REDIS
> +POCO_CONF_OPT_OMIT += Redis
> +endif
> +
>  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_CONF_OPT_OMIT))
> \
>  	--poquito \
>  	--unbundled \
>  	--shared
> -- 
> 2.20.1
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de