Commit a42c59db authored by Jörg Krause's avatar Jörg Krause Committed by Thomas Petazzoni
Browse files

package/poco: bump to version 1.6.1 



Also:
  * switch from sourceforge to github
  * remove hash (github-helper)
  * remove upstream applied patches
  * re-number remaining patches
  * add patch to fix build issue with `--bundled` config option

[Thomas: really remove hash file, since we're fetching from Github.]

Signed-off-by: default avatarJörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 1193328c

package/poco/0001-aarch64.patch

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
From 37899eda9563d9134cb5864751b6432cabfaac3e Mon Sep 17 00:00:00 2001

From: Will Newton <will.newton@linaro.org>

Date: Tue, 21 May 2013 22:11:05 +0100

Subject: [PATCH] Foundation/include/Poco/Platform.h: Add support for AArch64.



Add support for big and little endian AArch64 preprocessor defines.

---

 Foundation/include/Poco/Platform.h | 8 +++++++-

 1 file changed, 7 insertions(+), 1 deletion(-)



diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h

index f34f277..8ddb4cb 100644

--- a/Foundation/include/Poco/Platform.h

+++ b/Foundation/include/Poco/Platform.h

@@ -145,6 +145,7 @@

 #define POCO_ARCH_S390    0x0c

 #define POCO_ARCH_SH      0x0d

 #define POCO_ARCH_NIOS2   0x0e

+#define POCO_ARCH_AARCH64 0x0f

 

 

 #if defined(__ALPHA) || defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA)

@@ -207,7 +208,12 @@

 	#else

 		#define POCO_ARCH_BIG_ENDIAN 1

 	#endif

-

+#elif defined(__AARCH64EL__)

+	#define POCO_ARCH POCO_ARCH_AARCH64

+	#define POCO_ARCH_LITTLE_ENDIAN 1

+#elif defined(__AARCH64EB__)

+	#define POCO_ARCH POCO_ARCH_AARCH64

+	#define POCO_ARCH_BIG_ENDIAN 1

 #endif

 

 

-- 

1.8.1.4

package/poco/0003-add-staging-search-path.patch→package/poco/0001-poco-add-the-staging-path-to-search-path.patch

+38 −0
Original line number Diff line number Diff line 
From b8417607ec8840e6a1e27cf03b6958c794a33e49 Mon Sep 17 00:00:00 2001

From: Baruch Siach <baruch@tkos.co.il>

Subject: [PATCH] poco: add the staging path to search path

Date: Tue, 4 Aug 2015 10:14:00 +0200

Subject: [PATCH 1/2] poco: add the staging path to search path

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit



Add the mysql headers and client libraries to the search path of the

preprocessor and the linker. The $MYSQL_LIBDIR / $MYSQL_INCIDR variables
@@ -7,17 +12,27 @@ must be set from the make command line. 


[Peter: Remove host dirs, add MYSQL_INCDIR]

Signed-off-by: Baruch Siach <baruch@tkos.co.il>

[Jörg: Update to version 1.6.1 from github]

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>

---

--- 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

 Data/MySQL/Makefile | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)



diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile

index 0b18ca5..094e807 100644

--- a/Data/MySQL/Makefile

+++ b/Data/MySQL/Makefile

@@ -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/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -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 \

-- 

2.5.0

package/poco/0002-add-cross-build-config.patch

deleted100644 → 0
+0 −82
Original line number Diff line number Diff line 
From: Baruch Siach <baruch@tkos.co.il>

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 <baruch@tkos.co.il>

---

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

package/poco/0004-dont-build-debug-libs.patch→package/poco/0002-poco-don-t-build-debug-libraries.patch

+33 −0
Original line number Diff line number Diff line 
From e84c85cfa6742becbd4f82047ce92290bb3ec19a Mon Sep 17 00:00:00 2001

From: Baruch Siach <baruch@tkos.co.il>

Subject: [PATCH] poco: don't build debug libraries

Date: Tue, 4 Aug 2015 10:15:17 +0200

Subject: [PATCH 2/2] poco: don't build debug libraries

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit



Remove the debug libraries build dependency from the default target.



Signed-off-by: Baruch Siach <baruch@tkos.co.il>

[Jörg: Update to version 1.6.1 from github]

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>

---

 build/rules/compile | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



--- 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

diff --git a/build/rules/compile b/build/rules/compile

index 1945e3c..e0d7fbc 100644

--- a/build/rules/compile

+++ b/build/rules/compile

@@ -14,7 +14,7 @@

 

 all: $(DEFAULT_TARGET)
@@ -17,3 +28,6 @@ Signed-off-by: Baruch Siach <baruch@tkos.co.il> 
 all_debug: static_debug shared_debug

 all_release: static_release shared_release

 

-- 

2.5.0

package/poco/0003-Fix-conflicting-declaration-with-unbundled-pcre.patch

0 → 100644
+56 −0
Original line number Diff line number Diff line 
From 4e1165e1081e75de842567b16ae963cbed54e2a3 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>

Date: Tue, 4 Aug 2015 11:09:12 +0200

Subject: [PATCH 3/3] Fix conflicting declaration with unbundled pcre

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit



Building poco 1.6.1 with the `--unbundled` config options fails due to an

conflicting declaration of `pcre`:



```sh

In file included from src/RegularExpression.cpp:21:0:

/usr/include/pcre.h:325:26: error: conflicting declaration ‘typedef struct real_pcre pcre’

 typedef struct real_pcre pcre;

                          ^

In file included from src/RegularExpression.cpp:17:0:

include/Poco/RegularExpression.h:37:34: note: previous declaration as ‘typedef struct real_pcre8_or_16 pcre’

  typedef struct real_pcre8_or_16 pcre;

```



Upstream status:

https://github.com/pocoproject/poco/pull/897



Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>

---

 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 e1bc063..989ed52 100644

--- a/Foundation/include/Poco/RegularExpression.h

+++ b/Foundation/include/Poco/RegularExpression.h

@@ -26,7 +26,9 @@

 #include "Poco/Foundation.h"

 #include <vector>

 

-

+#if defined(POCO_UNBUNDLED)

+#include <pcre.h>

+#else

 //

 // Copy these definitions from pcre.h

 // to avoid pulling in the entire header file

@@ -37,7 +39,7 @@ extern "C"

 	typedef struct real_pcre8_or_16 pcre;

 	struct pcre_extra;

 }

-

+#endif

 

 namespace Poco {

 

-- 

2.5.0