Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/4] package/poco: fix the comment dependencies about riscv
@ 2020-06-29 21:07 Julien Olivain
  2020-06-29 21:07 ` [Buildroot] [PATCH 2/4] package/poco: bump to version 1.10.1 Julien Olivain
                   ` (4 more replies)
  0 siblings, 5 replies; 14+ messages in thread
From: Julien Olivain @ 2020-06-29 21:07 UTC (permalink / raw)
  To: buildroot

Commit 0737f48c5f "package/poco: disable build for riscv"
changed the Kconfig package dependency, without updating the dependency
of the comment. This patch set the comment dependency to the same
condition as the package.

Signed-off-by: Julien Olivain <juju@cotds.org>
---
 package/poco/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/poco/Config.in b/package/poco/Config.in
index f8f921de04..df37e53b53 100644
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@@ -86,4 +86,4 @@ comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library"
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \
 		|| !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
 	depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \
-		|| BR2_or1k || BR2_xtensa)
+		|| BR2_or1k || BR2_riscv || BR2_xtensa)
-- 
2.26.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 2/4] package/poco: bump to version 1.10.1
  2020-06-29 21:07 [Buildroot] [PATCH 1/4] package/poco: fix the comment dependencies about riscv Julien Olivain
@ 2020-06-29 21:07 ` Julien Olivain
  2020-06-29 21:18   ` Thomas Petazzoni
  2020-06-29 21:07 ` [Buildroot] [PATCH 3/4] package/poco: enable build for riscv64 Julien Olivain
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 14+ messages in thread
From: Julien Olivain @ 2020-06-29 21:07 UTC (permalink / raw)
  To: 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 <juju@cotds.org>
---
 ...-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 <baruch@tkos.co.il>
 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 <baruch@tkos.co.il>
 [J?rg: Update to version 1.6.1 from github]
 Signed-off-by: J?rg Krause <joerg.krause@embedded.rocks>
+[Julien: Rebased on version 1.10.1]
+Signed-off-by: Julien Olivain <juju@cotds.org>
 ---
  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 <github@jochen.sprickerhof.de>
 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 <thomas.petazzoni@bootlin.com>
+[Julien: rebased on version 1.10.1]
+Signed-off-by: Julien Olivain <juju@cotds.org>
 ---
  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 <thomas.petazzoni@bootlin.com>
 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 <thomas.petazzoni@bootlin.com>
 Upstream: https://github.com/pocoproject/poco/pull/2378
+[Julien: rebased on version 1.10.1]
+Signed-off-by: Julien Olivain <juju@cotds.org>
 ---
  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 \
-- 
2.26.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 3/4] package/poco: enable build for riscv64
  2020-06-29 21:07 [Buildroot] [PATCH 1/4] package/poco: fix the comment dependencies about riscv Julien Olivain
  2020-06-29 21:07 ` [Buildroot] [PATCH 2/4] package/poco: bump to version 1.10.1 Julien Olivain
@ 2020-06-29 21:07 ` Julien Olivain
  2020-06-29 21:19   ` Thomas Petazzoni
  2020-06-29 21:07 ` [Buildroot] [PATCH 4/4] package/poco: add new option for the Poco JWT component Julien Olivain
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 14+ messages in thread
From: Julien Olivain @ 2020-06-29 21:07 UTC (permalink / raw)
  To: buildroot

Poco riscv64 support was added upstream in commit:
https://github.com/pocoproject/poco/commit/26fa1b9e6bbe3a5d2d559d0e8bd5772a4e8fdfef
which is included in version >= 1.10.0.

This patch enable build for riscv64.

Signed-off-by: Julien Olivain <juju@cotds.org>
---
 package/poco/Config.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/poco/Config.in b/package/poco/Config.in
index b6914539e3..a3d19d5640 100644
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@@ -7,7 +7,8 @@ config BR2_PACKAGE_POCO
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on !BR2_STATIC_LIBS # dlopen()
 	depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \
-		|| BR2_or1k || BR2_riscv || BR2_xtensa)
+		|| BR2_or1k || (BR2_riscv && !BR2_RISCV_64) \
+		|| BR2_xtensa)
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_PCRE
 	help
@@ -88,4 +89,5 @@ comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library, gcc >= 5 w
 		|| !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)
+		|| BR2_or1k || (BR2_riscv && !BR2_RISCV_64) \
+		|| BR2_xtensa)
-- 
2.26.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 4/4] package/poco: add new option for the Poco JWT component
  2020-06-29 21:07 [Buildroot] [PATCH 1/4] package/poco: fix the comment dependencies about riscv Julien Olivain
  2020-06-29 21:07 ` [Buildroot] [PATCH 2/4] package/poco: bump to version 1.10.1 Julien Olivain
  2020-06-29 21:07 ` [Buildroot] [PATCH 3/4] package/poco: enable build for riscv64 Julien Olivain
@ 2020-06-29 21:07 ` Julien Olivain
  2020-06-29 21:21   ` Thomas Petazzoni
  2020-06-29 21:17 ` [Buildroot] [PATCH 1/4] package/poco: fix the comment dependencies about riscv Thomas Petazzoni
  2020-06-30 17:34 ` [Buildroot] [PATCH v2 1/4] package/poco: add BR2_PACKAGE_POCO_ARCH_SUPPORTS Julien Olivain
  4 siblings, 1 reply; 14+ messages in thread
From: Julien Olivain @ 2020-06-29 21:07 UTC (permalink / raw)
  To: buildroot

Poco 1.10.0 introduced a new JWT (JSON Web Tokens). See:
https://pocoproject.org/docs/Poco.JWT.Token.html

This patch add the option to build this component.

Signed-off-by: Julien Olivain <juju@cotds.org>
---
 package/poco/Config.in | 6 ++++++
 package/poco/poco.mk   | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/package/poco/Config.in b/package/poco/Config.in
index a3d19d5640..1a3b0ceeed 100644
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@@ -82,6 +82,12 @@ config BR2_PACKAGE_POCO_DATA_MYSQL
 	select BR2_PACKAGE_POCO_DATA
 	select BR2_PACKAGE_MYSQL
 
+config BR2_PACKAGE_POCO_JWT
+	bool "jwt"
+	select BR2_PACKAGE_POCO_JSON
+	select BR2_PACKAGE_POCO_CRYPTO
+	select BR2_PACKAGE_OPENSSL
+
 endif # BR2_PACKAGE_POCO
 
 comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library, gcc >= 5 w/ C++14"
diff --git a/package/poco/poco.mk b/package/poco/poco.mk
index 915d0dc400..c605044ba3 100644
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -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 JWT PageCompiler \
+POCO_OMIT = Data/ODBC PageCompiler \
 	$(if $(BR2_PACKAGE_POCO_JSON),,JSON) \
 	$(if $(BR2_PACKAGE_POCO_XML),,XML) \
 	$(if $(BR2_PACKAGE_POCO_UTIL),,Util) \
@@ -31,7 +31,8 @@ POCO_OMIT = Data/ODBC JWT PageCompiler \
 	$(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \
 	$(if $(BR2_PACKAGE_POCO_DATA),,Data) \
 	$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \
-	$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite)
+	$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \
+	$(if $(BR2_PACKAGE_POCO_JWT),,JWT)
 
 ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 POCO_CONF_OPTS += --no-fpenvironment --no-wstring
-- 
2.26.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 1/4] package/poco: fix the comment dependencies about riscv
  2020-06-29 21:07 [Buildroot] [PATCH 1/4] package/poco: fix the comment dependencies about riscv Julien Olivain
                   ` (2 preceding siblings ...)
  2020-06-29 21:07 ` [Buildroot] [PATCH 4/4] package/poco: add new option for the Poco JWT component Julien Olivain
@ 2020-06-29 21:17 ` Thomas Petazzoni
  2020-06-30 17:34 ` [Buildroot] [PATCH v2 1/4] package/poco: add BR2_PACKAGE_POCO_ARCH_SUPPORTS Julien Olivain
  4 siblings, 0 replies; 14+ messages in thread
From: Thomas Petazzoni @ 2020-06-29 21:17 UTC (permalink / raw)
  To: buildroot

On Mon, 29 Jun 2020 23:07:32 +0200
Julien Olivain <juju@cotds.org> wrote:

> Commit 0737f48c5f "package/poco: disable build for riscv"
> changed the Kconfig package dependency, without updating the dependency
> of the comment. This patch set the comment dependency to the same
> condition as the package.
> 
> Signed-off-by: Julien Olivain <juju@cotds.org>

We really want to introduce a BR2_PACKAGE_POCO_ARCH_SUPPORTS option so
that those architecture dependencies are not repeated.

You can grep for BR2_PACKAGE_.*_ARCH_SUPPORTS to see other uses of that
pattern.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 2/4] package/poco: bump to version 1.10.1
  2020-06-29 21:07 ` [Buildroot] [PATCH 2/4] package/poco: bump to version 1.10.1 Julien Olivain
@ 2020-06-29 21:18   ` Thomas Petazzoni
  0 siblings, 0 replies; 14+ messages in thread
From: Thomas Petazzoni @ 2020-06-29 21:18 UTC (permalink / raw)
  To: buildroot

On Mon, 29 Jun 2020 23:07:33 +0200
Julien Olivain <juju@cotds.org> wrote:

> +Subject: [PATCH 1/3] poco: add the staging path to search path

Please generate patches with "git format-patch -N" to not have the 1/3,
2/3, 3/3 part. "make check-package" normally warns about this.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 3/4] package/poco: enable build for riscv64
  2020-06-29 21:07 ` [Buildroot] [PATCH 3/4] package/poco: enable build for riscv64 Julien Olivain
@ 2020-06-29 21:19   ` Thomas Petazzoni
  0 siblings, 0 replies; 14+ messages in thread
From: Thomas Petazzoni @ 2020-06-29 21:19 UTC (permalink / raw)
  To: buildroot

On Mon, 29 Jun 2020 23:07:34 +0200
Julien Olivain <juju@cotds.org> wrote:

> diff --git a/package/poco/Config.in b/package/poco/Config.in
> index b6914539e3..a3d19d5640 100644
> --- a/package/poco/Config.in
> +++ b/package/poco/Config.in
> @@ -7,7 +7,8 @@ config BR2_PACKAGE_POCO
>  	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
>  	depends on !BR2_STATIC_LIBS # dlopen()
>  	depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \
> -		|| BR2_or1k || BR2_riscv || BR2_xtensa)
> +		|| BR2_or1k || (BR2_riscv && !BR2_RISCV_64) \

You could also just change:

	|| BR2_riscv

by:

	|| BR2_RISCV_32

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 4/4] package/poco: add new option for the Poco JWT component
  2020-06-29 21:07 ` [Buildroot] [PATCH 4/4] package/poco: add new option for the Poco JWT component Julien Olivain
@ 2020-06-29 21:21   ` Thomas Petazzoni
  0 siblings, 0 replies; 14+ messages in thread
From: Thomas Petazzoni @ 2020-06-29 21:21 UTC (permalink / raw)
  To: buildroot

On Mon, 29 Jun 2020 23:07:35 +0200
Julien Olivain <juju@cotds.org> wrote:

> +config BR2_PACKAGE_POCO_JWT
> +	bool "jwt"
> +	select BR2_PACKAGE_POCO_JSON
> +	select BR2_PACKAGE_POCO_CRYPTO
> +	select BR2_PACKAGE_OPENSSL

Do you need to select BR2_PACKAGE_OPENSSL here ? It's already implied
by selecting POCO_CRYPTO. In fact, what made me look in more details is
that you have a "select BR2_PACKAGE_OPENSSL", but "openssl" is not
added to POCO_DEPENDENCIES. It happens to work because you select
POCO_CRYPTO, which already adds "openssl" to POCO_DEPENDENCIES.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v2 1/4] package/poco: add BR2_PACKAGE_POCO_ARCH_SUPPORTS
  2020-06-29 21:07 [Buildroot] [PATCH 1/4] package/poco: fix the comment dependencies about riscv Julien Olivain
                   ` (3 preceding siblings ...)
  2020-06-29 21:17 ` [Buildroot] [PATCH 1/4] package/poco: fix the comment dependencies about riscv Thomas Petazzoni
@ 2020-06-30 17:34 ` Julien Olivain
  2020-06-30 17:34   ` [Buildroot] [PATCH v2 2/4] package/poco: bump to version 1.10.1 Julien Olivain
                     ` (4 more replies)
  4 siblings, 5 replies; 14+ messages in thread
From: Julien Olivain @ 2020-06-30 17:34 UTC (permalink / raw)
  To: buildroot

This change is motivated by a misalignment of the Kconfig package and
comment dependencies, introduced in commit 0737f48c5f "package/poco:
disable build for riscv" (BR_riscv was missing in the comment).
Introducing BR2_PACKAGE_POCO_ARCH_SUPPORTS solve this issue.

Signed-off-by: Julien Olivain <juju@cotds.org>
---
Changes v1 -> v2:
Suggested by Thomas:
  - introduce _ARCH_SUPPORTS to prevent duplicating dependency conditions
---
 package/poco/Config.in | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/package/poco/Config.in b/package/poco/Config.in
index f8f921de04..13f7b3b0a3 100644
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@@ -1,3 +1,8 @@
+config BR2_PACKAGE_POCO_ARCH_SUPPORTS
+	bool
+	default y if !(BR2_arc || BR2_microblaze || BR2_mipsel \
+		|| BR2_or1k || BR2_riscv || BR2_xtensa)
+
 config BR2_PACKAGE_POCO
 	bool "poco"
 	depends on BR2_INSTALL_LIBSTDCPP
@@ -5,8 +10,7 @@ config BR2_PACKAGE_POCO
 	# pthread_condattr_setclock
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on !BR2_STATIC_LIBS # dlopen()
-	depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \
-		|| BR2_or1k || BR2_riscv || BR2_xtensa)
+	depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_PCRE
 	help
@@ -85,5 +89,4 @@ endif # BR2_PACKAGE_POCO
 comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library"
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \
 		|| !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
-	depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \
-		|| BR2_or1k || BR2_xtensa)
+	depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS
-- 
2.26.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v2 2/4] package/poco: bump to version 1.10.1
  2020-06-30 17:34 ` [Buildroot] [PATCH v2 1/4] package/poco: add BR2_PACKAGE_POCO_ARCH_SUPPORTS Julien Olivain
@ 2020-06-30 17:34   ` Julien Olivain
  2020-06-30 17:34   ` [Buildroot] [PATCH v2 3/4] package/poco: enable build for riscv64 Julien Olivain
                     ` (3 subsequent siblings)
  4 siblings, 0 replies; 14+ messages in thread
From: Julien Olivain @ 2020-06-30 17:34 UTC (permalink / raw)
  To: 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 <juju@cotds.org>
---
Changes v1 -> v2:
Suggested by Thomas:
  - reformat attached patches with "git format-patch -N"
---
 ...oco-add-the-staging-path-to-search-path.patch | 10 ++++++----
 .../poco/0002-Add-support-for-m68000-1856.patch  | 12 +++++++-----
 ...c-utils.h-backport-double-conversion-ch.patch | 16 +++++++++-------
 package/poco/Config.in                           |  6 ++++--
 package/poco/poco.hash                           |  2 +-
 package/poco/poco.mk                             |  5 +++--
 6 files changed, 30 insertions(+), 21 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..fbabfc8f26 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,4 +1,4 @@
-From a3cb6e42fc2cfa0620ba737148fcbea0cf96a984 Mon Sep 17 00:00:00 2001
+From a53f3fd64a0f36ec9bc1307d7e66cdc2dee4aeaa Mon Sep 17 00:00:00 2001
 From: Baruch Siach <baruch@tkos.co.il>
 Date: Tue, 4 Aug 2015 10:14:00 +0200
 Subject: [PATCH] poco: add the staging path to search path
@@ -14,19 +14,21 @@ must be set from the make command line.
 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>
+[Julien: Rebased on version 1.10.1]
+Signed-off-by: Julien Olivain <juju@cotds.org>
 ---
  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..bc04a9bf69 100644
--- a/package/poco/0002-Add-support-for-m68000-1856.patch
+++ b/package/poco/0002-Add-support-for-m68000-1856.patch
@@ -1,4 +1,4 @@
-From e49753f7654dc62087e47731832d5992cc4d194e Mon Sep 17 00:00:00 2001
+From 221e308ad452035f4c1dc25e194f817a30f38f7b Mon Sep 17 00:00:00 2001
 From: Jochen Sprickerhof <github@jochen.sprickerhof.de>
 Date: Wed, 23 Aug 2017 16:50:51 +0200
 Subject: [PATCH] Add support for m68000 (#1856)
@@ -8,16 +8,18 @@ Originally taken from
 https://github.com/google/double-conversion/commit/da11179623145f53b204105a93b8bbca431141da
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+[Julien: rebased on version 1.10.1]
+Signed-off-by: Julien Olivain <juju@cotds.org>
 ---
  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..c06eebe8b0 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,4 +1,4 @@
-From b077b4a5afbfde47288baed072152a6b7f318250 Mon Sep 17 00:00:00 2001
+From fe7d230da03a35725ef768c07ce064324f941863 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 Date: Sun, 1 Jul 2018 15:37:47 +0200
 Subject: [PATCH] Foundation/src/utils.h: backport double-conversion change for
@@ -10,23 +10,25 @@ allows Poco to build on AArch64 big-endian.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 Upstream: https://github.com/pocoproject/poco/pull/2378
+[Julien: rebased on version 1.10.1]
+Signed-off-by: Julien Olivain <juju@cotds.org>
 ---
  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 13f7b3b0a3..cec48591ac 100644
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@@ -7,6 +7,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()
@@ -86,7 +87,8 @@ 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_PACKAGE_POCO_ARCH_SUPPORTS
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 \
-- 
2.26.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v2 3/4] package/poco: enable build for riscv64
  2020-06-30 17:34 ` [Buildroot] [PATCH v2 1/4] package/poco: add BR2_PACKAGE_POCO_ARCH_SUPPORTS Julien Olivain
  2020-06-30 17:34   ` [Buildroot] [PATCH v2 2/4] package/poco: bump to version 1.10.1 Julien Olivain
@ 2020-06-30 17:34   ` Julien Olivain
  2020-06-30 17:34   ` [Buildroot] [PATCH v2 4/4] package/poco: add new option for the Poco JWT component Julien Olivain
                     ` (2 subsequent siblings)
  4 siblings, 0 replies; 14+ messages in thread
From: Julien Olivain @ 2020-06-30 17:34 UTC (permalink / raw)
  To: buildroot

Poco riscv64 support was added upstream in commit:
https://github.com/pocoproject/poco/commit/26fa1b9e6bbe3a5d2d559d0e8bd5772a4e8fdfef
which is included in version >= 1.10.0.

This patch enable build for riscv64.

Signed-off-by: Julien Olivain <juju@cotds.org>
---
Changes v1 -> v2:
Suggested by Thomas:
  - use BR2_RISCV_32 instead of (BR2_riscv && !BR2_RISCV_64) in
    arch exclusion, to re-enable riscv64.
---
 package/poco/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/poco/Config.in b/package/poco/Config.in
index cec48591ac..cfc4f6c0aa 100644
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_POCO_ARCH_SUPPORTS
 	bool
 	default y if !(BR2_arc || BR2_microblaze || BR2_mipsel \
-		|| BR2_or1k || BR2_riscv || BR2_xtensa)
+		|| BR2_or1k || BR2_RISCV_32 || BR2_xtensa)
 
 config BR2_PACKAGE_POCO
 	bool "poco"
-- 
2.26.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v2 4/4] package/poco: add new option for the Poco JWT component
  2020-06-30 17:34 ` [Buildroot] [PATCH v2 1/4] package/poco: add BR2_PACKAGE_POCO_ARCH_SUPPORTS Julien Olivain
  2020-06-30 17:34   ` [Buildroot] [PATCH v2 2/4] package/poco: bump to version 1.10.1 Julien Olivain
  2020-06-30 17:34   ` [Buildroot] [PATCH v2 3/4] package/poco: enable build for riscv64 Julien Olivain
@ 2020-06-30 17:34   ` Julien Olivain
  2020-06-30 20:15   ` [Buildroot] [PATCH v2 1/4] package/poco: add BR2_PACKAGE_POCO_ARCH_SUPPORTS Yann E. MORIN
  2020-07-16 16:40   ` Peter Korsgaard
  4 siblings, 0 replies; 14+ messages in thread
From: Julien Olivain @ 2020-06-30 17:34 UTC (permalink / raw)
  To: buildroot

Poco 1.10.0 introduced a new JWT (JSON Web Tokens). See:
https://pocoproject.org/docs/Poco.JWT.Token.html

This patch add the option to build this component.

Signed-off-by: Julien Olivain <juju@cotds.org>
---
Changes v1 -> v2:
Suggested by Thomas:
  - Remove "select BR2_PACKAGE_OPENSSL" which is already selected
    by POCO_CRYPTO.
---
 package/poco/Config.in | 5 +++++
 package/poco/poco.mk   | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/package/poco/Config.in b/package/poco/Config.in
index cfc4f6c0aa..b7dbe3629c 100644
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@@ -85,6 +85,11 @@ config BR2_PACKAGE_POCO_DATA_MYSQL
 	select BR2_PACKAGE_POCO_DATA
 	select BR2_PACKAGE_MYSQL
 
+config BR2_PACKAGE_POCO_JWT
+	bool "jwt"
+	select BR2_PACKAGE_POCO_JSON
+	select BR2_PACKAGE_POCO_CRYPTO
+
 endif # BR2_PACKAGE_POCO
 
 comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library, gcc >= 5 w/ C++14"
diff --git a/package/poco/poco.mk b/package/poco/poco.mk
index 915d0dc400..c605044ba3 100644
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -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 JWT PageCompiler \
+POCO_OMIT = Data/ODBC PageCompiler \
 	$(if $(BR2_PACKAGE_POCO_JSON),,JSON) \
 	$(if $(BR2_PACKAGE_POCO_XML),,XML) \
 	$(if $(BR2_PACKAGE_POCO_UTIL),,Util) \
@@ -31,7 +31,8 @@ POCO_OMIT = Data/ODBC JWT PageCompiler \
 	$(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \
 	$(if $(BR2_PACKAGE_POCO_DATA),,Data) \
 	$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \
-	$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite)
+	$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \
+	$(if $(BR2_PACKAGE_POCO_JWT),,JWT)
 
 ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 POCO_CONF_OPTS += --no-fpenvironment --no-wstring
-- 
2.26.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v2 1/4] package/poco: add BR2_PACKAGE_POCO_ARCH_SUPPORTS
  2020-06-30 17:34 ` [Buildroot] [PATCH v2 1/4] package/poco: add BR2_PACKAGE_POCO_ARCH_SUPPORTS Julien Olivain
                     ` (2 preceding siblings ...)
  2020-06-30 17:34   ` [Buildroot] [PATCH v2 4/4] package/poco: add new option for the Poco JWT component Julien Olivain
@ 2020-06-30 20:15   ` Yann E. MORIN
  2020-07-16 16:40   ` Peter Korsgaard
  4 siblings, 0 replies; 14+ messages in thread
From: Yann E. MORIN @ 2020-06-30 20:15 UTC (permalink / raw)
  To: buildroot

Julien, All,

On 2020-06-30 19:34 +0200, Julien Olivain spake thusly:
> This change is motivated by a misalignment of the Kconfig package and
> comment dependencies, introduced in commit 0737f48c5f "package/poco:
> disable build for riscv" (BR_riscv was missing in the comment).
> Introducing BR2_PACKAGE_POCO_ARCH_SUPPORTS solve this issue.
> 
> Signed-off-by: Julien Olivain <juju@cotds.org>

Applied to master, thanks.

Yet, I did some minor changes, see below...

> ---
> Changes v1 -> v2:
> Suggested by Thomas:
>   - introduce _ARCH_SUPPORTS to prevent duplicating dependency conditions
> ---
>  package/poco/Config.in | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/package/poco/Config.in b/package/poco/Config.in
> index f8f921de04..13f7b3b0a3 100644
> --- a/package/poco/Config.in
> +++ b/package/poco/Config.in
> @@ -1,3 +1,8 @@
> +config BR2_PACKAGE_POCO_ARCH_SUPPORTS
> +	bool
> +	default y if !(BR2_arc || BR2_microblaze || BR2_mipsel \
> +		|| BR2_or1k || BR2_riscv || BR2_xtensa)

A long list is usally cumbersome to maintain, and in this case, it is
easy to split into a sequence of depends:

    config BR2_PACKAGE_POCO_ARCH_SUPPORTS
        bool
        default y
        depends on !BR2_arc
        depends on !BR2_microblaze
        [...]

So I've done that, which I find more readable. And makes your patch 3
simpler too.

Otherwise, series applied, thanks!

Regards,
Yann E. MORIN.

>  config BR2_PACKAGE_POCO
>  	bool "poco"
>  	depends on BR2_INSTALL_LIBSTDCPP
> @@ -5,8 +10,7 @@ config BR2_PACKAGE_POCO
>  	# pthread_condattr_setclock
>  	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
>  	depends on !BR2_STATIC_LIBS # dlopen()
> -	depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \
> -		|| BR2_or1k || BR2_riscv || BR2_xtensa)
> +	depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS
>  	select BR2_PACKAGE_ZLIB
>  	select BR2_PACKAGE_PCRE
>  	help
> @@ -85,5 +89,4 @@ endif # BR2_PACKAGE_POCO
>  comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library"
>  	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \
>  		|| !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
> -	depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \
> -		|| BR2_or1k || BR2_xtensa)
> +	depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS
> -- 
> 2.26.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v2 1/4] package/poco: add BR2_PACKAGE_POCO_ARCH_SUPPORTS
  2020-06-30 17:34 ` [Buildroot] [PATCH v2 1/4] package/poco: add BR2_PACKAGE_POCO_ARCH_SUPPORTS Julien Olivain
                     ` (3 preceding siblings ...)
  2020-06-30 20:15   ` [Buildroot] [PATCH v2 1/4] package/poco: add BR2_PACKAGE_POCO_ARCH_SUPPORTS Yann E. MORIN
@ 2020-07-16 16:40   ` Peter Korsgaard
  4 siblings, 0 replies; 14+ messages in thread
From: Peter Korsgaard @ 2020-07-16 16:40 UTC (permalink / raw)
  To: buildroot

>>>>> "Julien" == Julien Olivain <juju@cotds.org> writes:

 > This change is motivated by a misalignment of the Kconfig package and
 > comment dependencies, introduced in commit 0737f48c5f "package/poco:
 > disable build for riscv" (BR_riscv was missing in the comment).
 > Introducing BR2_PACKAGE_POCO_ARCH_SUPPORTS solve this issue.

 > Signed-off-by: Julien Olivain <juju@cotds.org>
 > ---
 > Changes v1 -> v2:
 > Suggested by Thomas:
 >   - introduce _ARCH_SUPPORTS to prevent duplicating dependency conditions

Committed to 2020.02.x and 2020.05.x, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 14+ messages in thread
end of thread, other threads:[~2020-07-16 16:40 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-29 21:07 [Buildroot] [PATCH 1/4] package/poco: fix the comment dependencies about riscv Julien Olivain
2020-06-29 21:07 ` [Buildroot] [PATCH 2/4] package/poco: bump to version 1.10.1 Julien Olivain
2020-06-29 21:18   ` Thomas Petazzoni
2020-06-29 21:07 ` [Buildroot] [PATCH 3/4] package/poco: enable build for riscv64 Julien Olivain
2020-06-29 21:19   ` Thomas Petazzoni
2020-06-29 21:07 ` [Buildroot] [PATCH 4/4] package/poco: add new option for the Poco JWT component Julien Olivain
2020-06-29 21:21   ` Thomas Petazzoni
2020-06-29 21:17 ` [Buildroot] [PATCH 1/4] package/poco: fix the comment dependencies about riscv Thomas Petazzoni
2020-06-30 17:34 ` [Buildroot] [PATCH v2 1/4] package/poco: add BR2_PACKAGE_POCO_ARCH_SUPPORTS Julien Olivain
2020-06-30 17:34   ` [Buildroot] [PATCH v2 2/4] package/poco: bump to version 1.10.1 Julien Olivain
2020-06-30 17:34   ` [Buildroot] [PATCH v2 3/4] package/poco: enable build for riscv64 Julien Olivain
2020-06-30 17:34   ` [Buildroot] [PATCH v2 4/4] package/poco: add new option for the Poco JWT component Julien Olivain
2020-06-30 20:15   ` [Buildroot] [PATCH v2 1/4] package/poco: add BR2_PACKAGE_POCO_ARCH_SUPPORTS Yann E. MORIN
2020-07-16 16:40   ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox