From patchwork Mon Jun 29 21:07:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Julien Olivain X-Patchwork-Id: 1319304 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cotds.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49wg7g5c7fzB3yf for ; Tue, 30 Jun 2020 07:08:15 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DF9FB88E52; Mon, 29 Jun 2020 21:08:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VVnYI99oxNk6; Mon, 29 Jun 2020 21:08:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 9FCE188DB2; Mon, 29 Jun 2020 21:08:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 9D5101BF28A for ; Mon, 29 Jun 2020 21:08:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 91B7B88C9C for ; Mon, 29 Jun 2020 21:08:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZJsUBhqyrpPr for ; Mon, 29 Jun 2020 21:08:06 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.cotds.org (mail.cotds.org [194.117.244.136]) by hemlock.osuosl.org (Postfix) with ESMTP id 1B0DC88E49 for ; Mon, 29 Jun 2020 21:08:06 +0000 (UTC) Received: from mail.cotds.org (mail.cotds.org [194.117.244.136]) by mail.cotds.org (Postfix) with ESMTP id A9A57D1326F for ; Mon, 29 Jun 2020 23:08:04 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail.cotds.org Received: from mail.cotds.org ([194.117.244.136]) by mail.cotds.org (mail.cotds.org [194.117.244.136]) (amavisd-new, port 10024) with ESMTP id 9bMg715Sgqov for ; Mon, 29 Jun 2020 23:08:01 +0200 (CEST) Received: from localhost.localdomain (82-64-214-120.subs.proxad.net [82.64.214.120]) by mail.cotds.org (Postfix) with ESMTPSA id 137E8D1326C; Mon, 29 Jun 2020 23:07:58 +0200 (CEST) From: Julien Olivain To: buildroot@buildroot.org Date: Mon, 29 Jun 2020 23:07:33 +0200 Message-Id: <20200629210735.179913-2-juju@cotds.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200629210735.179913-1-juju@cotds.org> References: <20200629210735.179913-1-juju@cotds.org> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/4] package/poco: bump to version 1.10.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Poco >= 1.10.0 requires a C++14 compiler. GCC needs to be at least 5.0. https://github.com/pocoproject/poco/blob/poco-1.10.1-release/CHANGELOG#L31 Since GCC 5.0 does not enable it by default, "-std=c++14" needs to be added in cflags. See poco 1.10.1 changelog: https://github.com/pocoproject/poco/blob/poco-1.10.1-release/CHANGELOG Poco 1.10.0 introduced a new JWT (JSON Web Tokens) component. It is currently unconditionally disabled to prevent build failure (as it re-enable Poco Crypto, which needs OpenSSL). Package patches are rebased on poco version 1.10.1. Signed-off-by: Julien Olivain --- ...-add-the-staging-path-to-search-path.patch | 12 ++++++----- .../0002-Add-support-for-m68000-1856.patch | 14 +++++++------ ...tils.h-backport-double-conversion-ch.patch | 20 ++++++++++--------- package/poco/Config.in | 6 ++++-- package/poco/poco.hash | 2 +- package/poco/poco.mk | 5 +++-- 6 files changed, 34 insertions(+), 25 deletions(-) diff --git a/package/poco/0001-poco-add-the-staging-path-to-search-path.patch b/package/poco/0001-poco-add-the-staging-path-to-search-path.patch index 5453cba13f..200e80228d 100644 --- a/package/poco/0001-poco-add-the-staging-path-to-search-path.patch +++ b/package/poco/0001-poco-add-the-staging-path-to-search-path.patch @@ -1,7 +1,7 @@ -From a3cb6e42fc2cfa0620ba737148fcbea0cf96a984 Mon Sep 17 00:00:00 2001 +From 9a344b0361112198d04d8b0110419ee0c55e55cb Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 4 Aug 2015 10:14:00 +0200 -Subject: [PATCH] poco: add the staging path to search path +Subject: [PATCH 1/3] poco: add the staging path to search path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -14,19 +14,21 @@ must be set from the make command line. Signed-off-by: Baruch Siach [Jörg: Update to version 1.6.1 from github] Signed-off-by: Jörg Krause +[Julien: Rebased on version 1.10.1] +Signed-off-by: Julien Olivain --- Data/MySQL/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile -index c6fc2ac1c..955fee2d4 100644 +index 64a7d3f82..955fee2d4 100644 --- a/Data/MySQL/Makefile +++ b/Data/MySQL/Makefile @@ -6,8 +6,8 @@ include $(POCO_BASE)/build/rules/global --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 +-SYSLIBS += -L/usr/local/lib -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) @@ -34,5 +36,5 @@ index c6fc2ac1c..955fee2d4 100644 objects = Binder Extractor SessionImpl Connector \ -- -2.14.4 +2.26.2 diff --git a/package/poco/0002-Add-support-for-m68000-1856.patch b/package/poco/0002-Add-support-for-m68000-1856.patch index 1cf99bf09c..ee8e1c6879 100644 --- a/package/poco/0002-Add-support-for-m68000-1856.patch +++ b/package/poco/0002-Add-support-for-m68000-1856.patch @@ -1,23 +1,25 @@ -From e49753f7654dc62087e47731832d5992cc4d194e Mon Sep 17 00:00:00 2001 +From 521104776b0258de99d2376153bf457f875d3769 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Wed, 23 Aug 2017 16:50:51 +0200 -Subject: [PATCH] Add support for m68000 (#1856) +Subject: [PATCH 2/3] Add support for m68000 (#1856) Originally taken from https://github.com/google/double-conversion/commit/da11179623145f53b204105a93b8bbca431141da Signed-off-by: Thomas Petazzoni +[Julien: rebased on version 1.10.1] +Signed-off-by: Julien Olivain --- Foundation/src/utils.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index 69cea1aca..a7bda0171 100644 +index c87cee13c..e891c0f10 100644 --- a/Foundation/src/utils.h +++ b/Foundation/src/utils.h -@@ -65,6 +65,8 @@ - defined(__AARCH64EL__) || \ +@@ -66,6 +66,8 @@ + defined(__AARCH64EL__) || \ defined(nios2) || defined(__nios2) || defined(__nios2__) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 +#elif defined(__mc68000__) @@ -26,5 +28,5 @@ index 69cea1aca..a7bda0171 100644 #if defined(_WIN32) // Windows uses a 64bit wide floating point stack. -- -2.14.4 +2.26.2 diff --git a/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch b/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch index 8193457f97..0d7a8e821b 100644 --- a/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch +++ b/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch @@ -1,8 +1,8 @@ -From b077b4a5afbfde47288baed072152a6b7f318250 Mon Sep 17 00:00:00 2001 +From 8aee152e421573bf9c4149b4b3e9b9bef03de397 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 1 Jul 2018 15:37:47 +0200 -Subject: [PATCH] Foundation/src/utils.h: backport double-conversion change for - AArch64 BE support +Subject: [PATCH 3/3] Foundation/src/utils.h: backport double-conversion change + for AArch64 BE support This commit, identical to upstream double-conversion commit https://github.com/google/double-conversion/commit/cb2beeb6771025377c665d1c3ea08388bc6e619a @@ -10,23 +10,25 @@ allows Poco to build on AArch64 big-endian. Signed-off-by: Thomas Petazzoni Upstream: https://github.com/pocoproject/poco/pull/2378 +[Julien: rebased on version 1.10.1] +Signed-off-by: Julien Olivain --- Foundation/src/utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index a7bda0171..fd49e1768 100644 +index e891c0f10..892f7db18 100644 --- a/Foundation/src/utils.h +++ b/Foundation/src/utils.h -@@ -62,7 +62,7 @@ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ +@@ -63,7 +63,7 @@ defined(__SH4__) || defined(__alpha__) || \ defined(_MIPS_ARCH_MIPS32R2) || \ -- defined(__AARCH64EL__) || \ -+ defined(__AARCH64EL__) || defined(__aarch64__) || \ + defined(__riscv) || \ +- defined(__AARCH64EL__) || \ ++ defined(__AARCH64EL__) || defined(__aarch64__) || \ defined(nios2) || defined(__nios2) || defined(__nios2__) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(__mc68000__) -- -2.14.4 +2.26.2 diff --git a/package/poco/Config.in b/package/poco/Config.in index df37e53b53..b6914539e3 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_POCO bool "poco" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 # pthread_condattr_setclock depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() @@ -82,8 +83,9 @@ config BR2_PACKAGE_POCO_DATA_MYSQL endif # BR2_PACKAGE_POCO -comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library" +comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library, gcc >= 5 w/ C++14" depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \ || BR2_or1k || BR2_riscv || BR2_xtensa) diff --git a/package/poco/poco.hash b/package/poco/poco.hash index 0cdaf0d3f3..2a2629733d 100644 --- a/package/poco/poco.hash +++ b/package/poco/poco.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 367014cdbcfe9df8f1d746239902149d2398af9b49ba2c1aaaa88616fd538f61 poco-1.9.4.tar.gz +sha256 44592a488d2830c0b4f3bfe4ae41f0c46abbfad49828d938714444e858a00818 poco-1.10.1.tar.gz sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE diff --git a/package/poco/poco.mk b/package/poco/poco.mk index d2b668ae13..915d0dc400 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -4,7 +4,7 @@ # ################################################################################ -POCO_VERSION = 1.9.4 +POCO_VERSION = 1.10.1 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE @@ -17,7 +17,7 @@ POCO_DEPENDENCIES = zlib pcre \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) -POCO_OMIT = Data/ODBC PageCompiler \ +POCO_OMIT = Data/ODBC JWT PageCompiler \ $(if $(BR2_PACKAGE_POCO_JSON),,JSON) \ $(if $(BR2_PACKAGE_POCO_XML),,XML) \ $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ @@ -59,6 +59,7 @@ define POCO_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) ./configure \ --config=Linux \ --prefix=/usr \ + --cflags=-std=c++14 \ --omit="$(POCO_OMIT)" \ $(POCO_CONF_OPTS) \ --unbundled \