* [Buildroot] [PATCH 1/4] package/cppcms: zlib is optional, not mandatory
@ 2022-04-03 15:46 Fabrice Fontaine
2022-04-03 15:46 ` [Buildroot] [PATCH 2/4] package/cppcms: libgcrypt " Fabrice Fontaine
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Fabrice Fontaine @ 2022-04-03 15:46 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
zlib is not mandatory since at least version 1.0.5 and
https://github.com/artyom-beilis/cppcms/commit/fc1c25f9c7af440f2fc579b150025addfa5421a5
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/cppcms/Config.in | 1 -
package/cppcms/cppcms.mk | 9 ++++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/package/cppcms/Config.in b/package/cppcms/Config.in
index 1d7635a83e..25fd93a7d0 100644
--- a/package/cppcms/Config.in
+++ b/package/cppcms/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_CPPCMS
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on !BR2_STATIC_LIBS # dlopen()
depends on BR2_USE_WCHAR
- select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_PCRE
select BR2_PACKAGE_LIBGCRYPT
help
diff --git a/package/cppcms/cppcms.mk b/package/cppcms/cppcms.mk
index b289617bbc..530b44427b 100644
--- a/package/cppcms/cppcms.mk
+++ b/package/cppcms/cppcms.mk
@@ -18,7 +18,7 @@ CPPCMS_CONF_OPTS = \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_CXX_FLAGS="$(CPPCMS_CXXFLAGS)"
-CPPCMS_DEPENDENCIES = zlib pcre libgcrypt
+CPPCMS_DEPENDENCIES = pcre libgcrypt
ifeq ($(BR2_PACKAGE_CPPCMS_ICU),y)
CPPCMS_CONF_OPTS += -DDISABLE_ICU_LOCALE=OFF
@@ -28,6 +28,13 @@ else
CPPCMS_CONF_OPTS += -DDISABLE_ICU_LOCALE=ON
endif
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+CPPCMS_CONF_OPTS += -DDISABLE_GZIP=OFF
+CPPCMS_DEPENDENCIES += zlib
+else
+CPPCMS_CONF_OPTS += -DDISABLE_GZIP=ON
+endif
+
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
# posix backend needs monetary.h which isn't available on uClibc
CPPCMS_CONF_OPTS += -DDISABLE_POSIX_LOCALE=on
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 2/4] package/cppcms: libgcrypt is optional, not mandatory
2022-04-03 15:46 [Buildroot] [PATCH 1/4] package/cppcms: zlib is optional, not mandatory Fabrice Fontaine
@ 2022-04-03 15:46 ` Fabrice Fontaine
2022-04-04 19:21 ` Peter Korsgaard
2022-04-03 15:46 ` [Buildroot] [PATCH 3/4] package/cppcms: add openssl optional dependency Fabrice Fontaine
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Fabrice Fontaine @ 2022-04-03 15:46 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
If libgcrypt (or openssl) is not enabled, aes_encryptor is disabled
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/cppcms/Config.in | 2 --
package/cppcms/cppcms.mk | 9 ++++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/package/cppcms/Config.in b/package/cppcms/Config.in
index 25fd93a7d0..6c0bff934c 100644
--- a/package/cppcms/Config.in
+++ b/package/cppcms/Config.in
@@ -1,12 +1,10 @@
config BR2_PACKAGE_CPPCMS
bool "cppcms"
depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on !BR2_STATIC_LIBS # dlopen()
depends on BR2_USE_WCHAR
select BR2_PACKAGE_PCRE
- select BR2_PACKAGE_LIBGCRYPT
help
CppCMS is a Free High Performance Web Development Framework
(not a CMS) aimed for Rapid Web Application Development. It
diff --git a/package/cppcms/cppcms.mk b/package/cppcms/cppcms.mk
index 530b44427b..357909f31d 100644
--- a/package/cppcms/cppcms.mk
+++ b/package/cppcms/cppcms.mk
@@ -18,7 +18,7 @@ CPPCMS_CONF_OPTS = \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_CXX_FLAGS="$(CPPCMS_CXXFLAGS)"
-CPPCMS_DEPENDENCIES = pcre libgcrypt
+CPPCMS_DEPENDENCIES = pcre
ifeq ($(BR2_PACKAGE_CPPCMS_ICU),y)
CPPCMS_CONF_OPTS += -DDISABLE_ICU_LOCALE=OFF
@@ -28,6 +28,13 @@ else
CPPCMS_CONF_OPTS += -DDISABLE_ICU_LOCALE=ON
endif
+ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+CPPCMS_CONF_OPTS += -DDISABLE_GCRYPT=OFF
+CPPCMS_DEPENDENCIES += libgcrypt
+else
+CPPCMS_CONF_OPTS += -DDISABLE_GCRYPT=ON
+endif
+
ifeq ($(BR2_PACKAGE_ZLIB),y)
CPPCMS_CONF_OPTS += -DDISABLE_GZIP=OFF
CPPCMS_DEPENDENCIES += zlib
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 3/4] package/cppcms: add openssl optional dependency
2022-04-03 15:46 [Buildroot] [PATCH 1/4] package/cppcms: zlib is optional, not mandatory Fabrice Fontaine
2022-04-03 15:46 ` [Buildroot] [PATCH 2/4] package/cppcms: libgcrypt " Fabrice Fontaine
@ 2022-04-03 15:46 ` Fabrice Fontaine
2022-04-04 19:22 ` Peter Korsgaard
2022-04-03 15:46 ` [Buildroot] [PATCH 4/4] package/cppcms: bump to version 2.0.0-beta2 Fabrice Fontaine
2022-04-04 19:21 ` [Buildroot] [PATCH 1/4] package/cppcms: zlib is optional, not mandatory Peter Korsgaard
3 siblings, 1 reply; 8+ messages in thread
From: Fabrice Fontaine @ 2022-04-03 15:46 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
openssl is an optional dependency since version 1.0.5 and
https://github.com/artyom-beilis/cppcms/commit/7cfdc9f703a35c42f7168573ffcc92eaa37e4ab6
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/cppcms/cppcms.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/cppcms/cppcms.mk b/package/cppcms/cppcms.mk
index 357909f31d..c560b5d0fa 100644
--- a/package/cppcms/cppcms.mk
+++ b/package/cppcms/cppcms.mk
@@ -35,6 +35,13 @@ else
CPPCMS_CONF_OPTS += -DDISABLE_GCRYPT=ON
endif
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+CPPCMS_CONF_OPTS += -DDISABLE_OPENSSL=OFF
+CPPCMS_DEPENDENCIES += openssl
+else
+CPPCMS_CONF_OPTS += -DDISABLE_OPENSSL=ON
+endif
+
ifeq ($(BR2_PACKAGE_ZLIB),y)
CPPCMS_CONF_OPTS += -DDISABLE_GZIP=OFF
CPPCMS_DEPENDENCIES += zlib
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 4/4] package/cppcms: bump to version 2.0.0-beta2
2022-04-03 15:46 [Buildroot] [PATCH 1/4] package/cppcms: zlib is optional, not mandatory Fabrice Fontaine
2022-04-03 15:46 ` [Buildroot] [PATCH 2/4] package/cppcms: libgcrypt " Fabrice Fontaine
2022-04-03 15:46 ` [Buildroot] [PATCH 3/4] package/cppcms: add openssl optional dependency Fabrice Fontaine
@ 2022-04-03 15:46 ` Fabrice Fontaine
2022-04-03 19:05 ` Yann E. MORIN
2022-04-04 19:21 ` [Buildroot] [PATCH 1/4] package/cppcms: zlib is optional, not mandatory Peter Korsgaard
3 siblings, 1 reply; 8+ messages in thread
From: Fabrice Fontaine @ 2022-04-03 15:46 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
- Update indentation in hash file (two spaces)
- This bump will fix the following build failure if python2 is not
available on host (while at it, add host-python3 dependency):
Traceback (most recent call last):
File "/home/autobuild/autobuild/instance-4/output-1/build/cppcms-1.2.1/bin/cppcms_tmpl_cc", line 14, in <module>
import StringIO
ModuleNotFoundError: No module named 'StringIO'
http://cppcms.com/wikipp/en/page/cppcms_2_0_whats_new
Fixes:
- http://autobuild.buildroot.org/results/00482ee24deae95a91f8499f499b18e15f14b51a
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/cppcms/cppcms.hash | 14 +++++++-------
package/cppcms/cppcms.mk | 6 +++---
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package/cppcms/cppcms.hash b/package/cppcms/cppcms.hash
index 86f86d94af..a8d04ff36f 100644
--- a/package/cppcms/cppcms.hash
+++ b/package/cppcms/cppcms.hash
@@ -1,8 +1,8 @@
-# From http://sourceforge.net/projects/cppcms/files/cppcms/1.2.1/
-sha1 9cb25cc5d507d2f4235326ba3815eba252b4ac77 cppcms-1.2.1.tar.bz2
-md5 2bb259fefb86532e404207c71c094a0c cppcms-1.2.1.tar.bz2
+# From http://sourceforge.net/projects/cppcms/files/cppcms/2.0.0-beta2/
+sha1 746cc5e3f58565d91d9ded6e2616399d60e9d01d cppcms-2.0.0.beta2.tar.bz2
+md5 ef561d13ee92d2053151cab073feba10 cppcms-2.0.0.beta2.tar.bz2
# Locally computed:
-sha256 10fec7710409c949a229b9019ea065e25ff5687103037551b6f05716bf6cac52 cppcms-1.2.1.tar.bz2
-sha256 fb7c15ddf590037d4cd18ebd61148a2304b9243369d238a64f599182377e32db COPYING.TXT
-sha256 3e4012cc5950e05bedfdd2f00ceffe1ef71c46ac8c79f07e237ecb23c773f65f MIT.TXT
-sha256 d6ce062e5cf4f7e3c536d7d2fee84c882c45245f1848ed3162401f2b29fa2b4b THIRD_PARTY_SOFTWARE.TXT
+sha256 697031c7d141fdd215c6be5090b66e2106a63bb3e52f09ee8120e8efc6c08a21 cppcms-2.0.0.beta2.tar.bz2
+sha256 fb7c15ddf590037d4cd18ebd61148a2304b9243369d238a64f599182377e32db COPYING.TXT
+sha256 3e4012cc5950e05bedfdd2f00ceffe1ef71c46ac8c79f07e237ecb23c773f65f MIT.TXT
+sha256 d6ce062e5cf4f7e3c536d7d2fee84c882c45245f1848ed3162401f2b29fa2b4b THIRD_PARTY_SOFTWARE.TXT
diff --git a/package/cppcms/cppcms.mk b/package/cppcms/cppcms.mk
index c560b5d0fa..8a59990a8d 100644
--- a/package/cppcms/cppcms.mk
+++ b/package/cppcms/cppcms.mk
@@ -4,8 +4,8 @@
#
################################################################################
-CPPCMS_VERSION = 1.2.1
-CPPCMS_SOURCE = cppcms-$(CPPCMS_VERSION).tar.bz2
+CPPCMS_VERSION = 2.0.0-beta2
+CPPCMS_SOURCE = cppcms-$(subst -,.,$(CPPCMS_VERSION)).tar.bz2
CPPCMS_LICENSE = MIT, BSL-1.0 (boost), Public Domain (json2.js), Zlib (md5)
CPPCMS_LICENSE_FILES = COPYING.TXT MIT.TXT THIRD_PARTY_SOFTWARE.TXT
CPPCMS_SITE = http://downloads.sourceforge.net/project/cppcms/cppcms/$(CPPCMS_VERSION)
@@ -18,7 +18,7 @@ CPPCMS_CONF_OPTS = \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_CXX_FLAGS="$(CPPCMS_CXXFLAGS)"
-CPPCMS_DEPENDENCIES = pcre
+CPPCMS_DEPENDENCIES = host-python3 pcre
ifeq ($(BR2_PACKAGE_CPPCMS_ICU),y)
CPPCMS_CONF_OPTS += -DDISABLE_ICU_LOCALE=OFF
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Buildroot] [PATCH 4/4] package/cppcms: bump to version 2.0.0-beta2
2022-04-03 15:46 ` [Buildroot] [PATCH 4/4] package/cppcms: bump to version 2.0.0-beta2 Fabrice Fontaine
@ 2022-04-03 19:05 ` Yann E. MORIN
0 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2022-04-03 19:05 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: buildroot
Fabrice, All,
On 2022-04-03 17:46 +0200, Fabrice Fontaine spake thusly:
> - Update indentation in hash file (two spaces)
> - This bump will fix the following build failure if python2 is not
> available on host (while at it, add host-python3 dependency):
>
> Traceback (most recent call last):
> File "/home/autobuild/autobuild/instance-4/output-1/build/cppcms-1.2.1/bin/cppcms_tmpl_cc", line 14, in <module>
> import StringIO
> ModuleNotFoundError: No module named 'StringIO'
>
> http://cppcms.com/wikipp/en/page/cppcms_2_0_whats_new
>
> Fixes:
> - http://autobuild.buildroot.org/results/00482ee24deae95a91f8499f499b18e15f14b51a
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Series of 4 patches applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> package/cppcms/cppcms.hash | 14 +++++++-------
> package/cppcms/cppcms.mk | 6 +++---
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/package/cppcms/cppcms.hash b/package/cppcms/cppcms.hash
> index 86f86d94af..a8d04ff36f 100644
> --- a/package/cppcms/cppcms.hash
> +++ b/package/cppcms/cppcms.hash
> @@ -1,8 +1,8 @@
> -# From http://sourceforge.net/projects/cppcms/files/cppcms/1.2.1/
> -sha1 9cb25cc5d507d2f4235326ba3815eba252b4ac77 cppcms-1.2.1.tar.bz2
> -md5 2bb259fefb86532e404207c71c094a0c cppcms-1.2.1.tar.bz2
> +# From http://sourceforge.net/projects/cppcms/files/cppcms/2.0.0-beta2/
> +sha1 746cc5e3f58565d91d9ded6e2616399d60e9d01d cppcms-2.0.0.beta2.tar.bz2
> +md5 ef561d13ee92d2053151cab073feba10 cppcms-2.0.0.beta2.tar.bz2
> # Locally computed:
> -sha256 10fec7710409c949a229b9019ea065e25ff5687103037551b6f05716bf6cac52 cppcms-1.2.1.tar.bz2
> -sha256 fb7c15ddf590037d4cd18ebd61148a2304b9243369d238a64f599182377e32db COPYING.TXT
> -sha256 3e4012cc5950e05bedfdd2f00ceffe1ef71c46ac8c79f07e237ecb23c773f65f MIT.TXT
> -sha256 d6ce062e5cf4f7e3c536d7d2fee84c882c45245f1848ed3162401f2b29fa2b4b THIRD_PARTY_SOFTWARE.TXT
> +sha256 697031c7d141fdd215c6be5090b66e2106a63bb3e52f09ee8120e8efc6c08a21 cppcms-2.0.0.beta2.tar.bz2
> +sha256 fb7c15ddf590037d4cd18ebd61148a2304b9243369d238a64f599182377e32db COPYING.TXT
> +sha256 3e4012cc5950e05bedfdd2f00ceffe1ef71c46ac8c79f07e237ecb23c773f65f MIT.TXT
> +sha256 d6ce062e5cf4f7e3c536d7d2fee84c882c45245f1848ed3162401f2b29fa2b4b THIRD_PARTY_SOFTWARE.TXT
> diff --git a/package/cppcms/cppcms.mk b/package/cppcms/cppcms.mk
> index c560b5d0fa..8a59990a8d 100644
> --- a/package/cppcms/cppcms.mk
> +++ b/package/cppcms/cppcms.mk
> @@ -4,8 +4,8 @@
> #
> ################################################################################
>
> -CPPCMS_VERSION = 1.2.1
> -CPPCMS_SOURCE = cppcms-$(CPPCMS_VERSION).tar.bz2
> +CPPCMS_VERSION = 2.0.0-beta2
> +CPPCMS_SOURCE = cppcms-$(subst -,.,$(CPPCMS_VERSION)).tar.bz2
> CPPCMS_LICENSE = MIT, BSL-1.0 (boost), Public Domain (json2.js), Zlib (md5)
> CPPCMS_LICENSE_FILES = COPYING.TXT MIT.TXT THIRD_PARTY_SOFTWARE.TXT
> CPPCMS_SITE = http://downloads.sourceforge.net/project/cppcms/cppcms/$(CPPCMS_VERSION)
> @@ -18,7 +18,7 @@ CPPCMS_CONF_OPTS = \
> -DCMAKE_SKIP_RPATH=ON \
> -DCMAKE_CXX_FLAGS="$(CPPCMS_CXXFLAGS)"
>
> -CPPCMS_DEPENDENCIES = pcre
> +CPPCMS_DEPENDENCIES = host-python3 pcre
>
> ifeq ($(BR2_PACKAGE_CPPCMS_ICU),y)
> CPPCMS_CONF_OPTS += -DDISABLE_ICU_LOCALE=OFF
> --
> 2.35.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/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. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH 1/4] package/cppcms: zlib is optional, not mandatory
2022-04-03 15:46 [Buildroot] [PATCH 1/4] package/cppcms: zlib is optional, not mandatory Fabrice Fontaine
` (2 preceding siblings ...)
2022-04-03 15:46 ` [Buildroot] [PATCH 4/4] package/cppcms: bump to version 2.0.0-beta2 Fabrice Fontaine
@ 2022-04-04 19:21 ` Peter Korsgaard
3 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2022-04-04 19:21 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> zlib is not mandatory since at least version 1.0.5 and
> https://github.com/artyom-beilis/cppcms/commit/fc1c25f9c7af440f2fc579b150025addfa5421a5
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed to 2022.02.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-04-04 19:22 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-03 15:46 [Buildroot] [PATCH 1/4] package/cppcms: zlib is optional, not mandatory Fabrice Fontaine
2022-04-03 15:46 ` [Buildroot] [PATCH 2/4] package/cppcms: libgcrypt " Fabrice Fontaine
2022-04-04 19:21 ` Peter Korsgaard
2022-04-03 15:46 ` [Buildroot] [PATCH 3/4] package/cppcms: add openssl optional dependency Fabrice Fontaine
2022-04-04 19:22 ` Peter Korsgaard
2022-04-03 15:46 ` [Buildroot] [PATCH 4/4] package/cppcms: bump to version 2.0.0-beta2 Fabrice Fontaine
2022-04-03 19:05 ` Yann E. MORIN
2022-04-04 19:21 ` [Buildroot] [PATCH 1/4] package/cppcms: zlib is optional, not mandatory Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.