From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] libpoco: version bump 1.4.6p2 -> 1.6.1
Date: Thu, 11 Feb 2016 12:28:59 +0100 [thread overview]
Message-ID: <20160211112859.GO32288@pengutronix.de> (raw)
In-Reply-To: <OF9A1A35CC.295EF46D-ONC1257F4E.0025A9C6-C1257F4E.0025A9C6@erhardt-leimer.com>
On Wed, Feb 03, 2016 at 07:51:22AM +0100, Tobias Schmidl wrote:
> See https://raw.githubusercontent.com/pocoproject/poco/poco-1.6.1-release/CHANGELOG for more information.
>
> Signed-off-by: Tobias Schmidl <T.Schmidl@erhardt-leimer.com>
Thanks, applied.
Michael
> ---
> ...ke-Linux-configuration-crosscompile-aware.patch | 38 ----------------------
> patches/poco-1.4.6p2/series | 5 ---
> patches/poco-1.6.1/0001-libpcre-bug.patch | 12 +++++++
> .../0002-fix-parallel-building.patch | 0
> ...003-Include-pcre.h-for-an-unbundled-build.patch | 38 ++++++++++++++++++++++
> patches/poco-1.6.1/series | 3 ++
> rules/poco.make | 9 ++---
> 7 files changed, 58 insertions(+), 47 deletions(-)
> delete mode 100644 patches/poco-1.4.6p2/0001-make-Linux-configuration-crosscompile-aware.patch
> delete mode 100644 patches/poco-1.4.6p2/series
> create mode 100644 patches/poco-1.6.1/0001-libpcre-bug.patch
> rename patches/{poco-1.4.6p2 => poco-1.6.1}/0002-fix-parallel-building.patch (100%)
> create mode 100644 patches/poco-1.6.1/0003-Include-pcre.h-for-an-unbundled-build.patch
> create mode 100644 patches/poco-1.6.1/series
>
> diff --git a/patches/poco-1.4.6p2/0001-make-Linux-configuration-crosscompile-aware.patch b/patches/poco-1.4.6p2/0001-make-Linux-configuration-crosscompile-aware.patch
> deleted file mode 100644
> index fb15644..0000000
> --- a/patches/poco-1.4.6p2/0001-make-Linux-configuration-crosscompile-aware.patch
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -From: Robert Schwebel <r.schwebel@pengutronix.de>
> -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
> -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(-)
> -
> -diff --git a/build/config/Linux b/build/config/Linux
> -index 4781a12..7612e59 100644
> ---- a/build/config/Linux
> -+++ b/build/config/Linux
> -@@ -15,14 +15,14 @@ LINKMODE ?= SHARED
> - #
> - # Define Tools
> - #
> --CC = gcc
> --CXX = g++
> -+CC = $(CROSS_COMPILE)gcc
> -+CXX = $(CROSS_COMPILE)g++
> - LINK = $(CXX)
> --LIB = ar -cr
> --RANLIB = ranlib
> -+LIB = $(CROSS_COMPILE)ar -cr
> -+RANLIB = $(CROSS_COMPILE)ranlib
> - SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
> - SHLIBLN = $(POCO_BASE)/build/script/shlibln
> --STRIP = strip
> -+STRIP = $(CROSS_COMPILE)strip
> - DEP = $(POCO_BASE)/build/script/makedepend.gcc
> - SHELL = sh
> - RM = rm -rf
> diff --git a/patches/poco-1.4.6p2/series b/patches/poco-1.4.6p2/series
> deleted file mode 100644
> index d5d1e3b..0000000
> --- a/patches/poco-1.4.6p2/series
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-make-Linux-configuration-crosscompile-aware.patch
> -0002-fix-parallel-building.patch
> -# caa577b66d6611048eb3d4345dc8d6a4 - git-ptx-patches magic
> diff --git a/patches/poco-1.6.1/0001-libpcre-bug.patch b/patches/poco-1.6.1/0001-libpcre-bug.patch
> new file mode 100644
> index 0000000..97d5d05
> --- /dev/null
> +++ b/patches/poco-1.6.1/0001-libpcre-bug.patch
> @@ -0,0 +1,12 @@
> +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.4.6p2/0002-fix-parallel-building.patch b/patches/poco-1.6.1/0002-fix-parallel-building.patch
> similarity index 100%
> rename from patches/poco-1.4.6p2/0002-fix-parallel-building.patch
> rename to patches/poco-1.6.1/0002-fix-parallel-building.patch
> 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
> new file mode 100644
> index 0000000..b5d6b35
> --- /dev/null
> +++ b/patches/poco-1.6.1/0003-Include-pcre.h-for-an-unbundled-build.patch
> @@ -0,0 +1,38 @@
> +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
> new file mode 100644
> index 0000000..ff8ef98
> --- /dev/null
> +++ b/patches/poco-1.6.1/series
> @@ -0,0 +1,3 @@
> +0001-libpcre-bug.patch
> +0002-fix-parallel-building.patch
> +0003-Include-pcre.h-for-an-unbundled-build.patch
> diff --git a/rules/poco.make b/rules/poco.make
> index ff74009..e294e4b 100644
> --- a/rules/poco.make
> +++ b/rules/poco.make
> @@ -16,14 +16,14 @@ PACKAGES-$(PTXCONF_POCO) += poco
> #
> # Paths and names
> #
> -POCO_VERSION := 1.4.6p2
> -POCO_MD5 := 33f6a0b7e7fd6b86a1028b1e7fa78b84
> +POCO_VERSION := 1.6.1
> +POCO_MD5 := 8bc6b7dc22a8cbd97257028c02ac2707
> POCO := poco-$(POCO_VERSION)
> POCO_SUFFIX := tar.gz
> -POCO_URL := http://pocoproject.org/releases/poco-1.4.6/$(POCO).$(POCO_SUFFIX)
> +POCO_URL := http://pocoproject.org/releases/$(POCO)/$(POCO).$(POCO_SUFFIX)
> POCO_SOURCE := $(SRCDIR)/$(POCO).$(POCO_SUFFIX)
> POCO_DIR := $(shell readlink -f "$(BUILDDIR)/$(POCO)")
> -POCO_LICENSE := unknown
> +POCO_LICENSE := BSL-1.0
>
> # ----------------------------------------------------------------------------
> # Prepare
> @@ -63,6 +63,7 @@ $(STATEDIR)/poco.targetinstall:
> @$(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)
>
> @$(call install_finish, poco)
>
> --
> 2.1.4
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
prev parent reply other threads:[~2016-02-11 11:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-03 6:51 Tobias Schmidl
2016-02-11 11:28 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160211112859.GO32288@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox