* [Buildroot] [PATCH 1/5] package/gnutls: disable library search in /usr/lib
@ 2022-05-12 16:01 Arnout Vandecappelle (Essensium/Mind)
2022-05-12 16:01 ` [Buildroot] [PATCH 2/5] package/gnutls: remove unused libregex dependency Arnout Vandecappelle (Essensium/Mind)
` (5 more replies)
0 siblings, 6 replies; 11+ messages in thread
From: Arnout Vandecappelle (Essensium/Mind) @ 2022-05-12 16:01 UTC (permalink / raw)
To: buildroot; +Cc: Matt Weber
gnutls's configure script has a weird approach where it first searches
for dependent libraries in the path specified by --prefix, before
searching in the default search path. Since we set --prefix to /usr,
and it doesn't take into account DESTDIR (which is anyway not set at
configure time), that means it will first search /usr/lib before
searching $(STAGING_DIR)/usr/lib.
Ideally, this would be fixed in the configure script itself. However,
the m4 file that does this is pretty complex, it's not immediately clear
where to add $DESTDIR. In addition it comes from gnulib which is a
somewhat annoying upstream.
Therefore, instead, bypass the prefix lookup with
--without-libfoo-prefix. Note that we could set
--with-libfoo-prefix=$(STAGING_DIR)/usr (the latter is already done for
librt and libpthread), but that's pretty pointless -
--without-libfoo-prefix in fact reverts to what should have been done in
the first place, i.e. use the toolchain search path.
Add --without-libfoo-prefix for all options defined in configure (found
with ./configure --help | grep without-.*-prefix). Most of these are
only used in tests (e.g. libcrypto) or even not at all (e.g. libiconv),
but it's fairly hard to discover this and to be sure that they are
indeed not needed, so better pass all of them.
Remove the now-redundant arguments for librt and libpthread.
Add a comment to remind people to revisit these when bumping the
version.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Cc: Peter Korsgaard <peter@korsgaard.com>
---
This is for stable, but need to check if the same prefix options exist
in 3.7.3.
---
package/gnutls/gnutls.mk | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 0e461cd44c..b5503b1fc9 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -4,6 +4,7 @@
#
################################################################################
+# When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS
GNUTLS_VERSION_MAJOR = 3.7
GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).4
GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
@@ -26,7 +27,15 @@ GNUTLS_CONF_OPTS = \
--disable-tests \
--enable-local-libopts \
--enable-openssl-compatibility \
- --with-librt-prefix=$(STAGING_DIR) \
+ --without-libcrypto-prefix \
+ --without-libdl-prefix \
+ --without-libev-prefix \
+ --without-libiconv-prefix \
+ --without-libintl-prefix \
+ --without-libpthread-prefix \
+ --without-libseccomp-prefix \
+ --without-librt-prefix \
+ --without-libz-prefix \
--without-tpm \
$(if $(BR2_PACKAGE_GNUTLS_OPENSSL),--enable,--disable)-openssl-compatibility \
$(if $(BR2_PACKAGE_GNUTLS_TOOLS),--enable-tools,--disable-tools) \
@@ -39,9 +48,6 @@ GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \
gl_cv_func_gettimeofday_clobber=no
GNUTLS_INSTALL_STAGING = YES
-# libpthread autodetection poison the linkpath
-GNUTLS_CONF_OPTS += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr)
-
# gnutls needs libregex, but pcre can be used too
# The check isn't cross-compile friendly
GNUTLS_CONF_ENV += libopts_cv_with_libregex=yes
@@ -70,7 +76,6 @@ GNUTLS_CONF_OPTS += --without-p11-kit
endif
ifeq ($(BR2_PACKAGE_LIBUNISTRING),y)
-GNUTLS_CONF_OPTS += --with-libunistring-prefix=$(STAGING_DIR)/usr
GNUTLS_DEPENDENCIES += libunistring
else
GNUTLS_CONF_OPTS += --with-included-unistring
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 2/5] package/gnutls: remove unused libregex dependency
2022-05-12 16:01 [Buildroot] [PATCH 1/5] package/gnutls: disable library search in /usr/lib Arnout Vandecappelle (Essensium/Mind)
@ 2022-05-12 16:01 ` Arnout Vandecappelle (Essensium/Mind)
2022-05-12 20:52 ` Yann E. MORIN
2022-05-12 16:01 ` [Buildroot] [PATCH 3/5] package/gnutls: remove redundant --enable-openssl-compatibility Arnout Vandecappelle (Essensium/Mind)
` (4 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Arnout Vandecappelle (Essensium/Mind) @ 2022-05-12 16:01 UTC (permalink / raw)
To: buildroot; +Cc: Matt Weber
The pcre/libregex dependency was removed in version 3.7.3 with upstream
commit 26578b7d02c269ff1d34ff782d84c7667734d03d, which removed the
bundled libopts. Remove the pcre dependency and the relevant CONF_OPTS
handling.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
This is for stable since it's already the case for 3.7.3, the version in
2022.02.x
---
package/gnutls/Config.in | 1 -
package/gnutls/gnutls.mk | 11 +----------
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
index d57bb8d135..28982b15a1 100644
--- a/package/gnutls/Config.in
+++ b/package/gnutls/Config.in
@@ -7,7 +7,6 @@ config BR2_PACKAGE_GNUTLS
depends on BR2_USE_WCHAR
select BR2_PACKAGE_LIBTASN1
select BR2_PACKAGE_NETTLE
- select BR2_PACKAGE_PCRE
help
GnuTLS is a secure communications library implementing the SSL
and TLS protocols and technologies around them.
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index b5503b1fc9..79e7d529b1 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -17,7 +17,7 @@ GNUTLS_LICENSE += , GPL-3.0+ (gnutls-openssl library)
GNUTLS_LICENSE_FILES += doc/COPYING
endif
-GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle pcre
+GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle
GNUTLS_CPE_ID_VENDOR = gnu
GNUTLS_CONF_OPTS = \
--disable-doc \
@@ -25,7 +25,6 @@ GNUTLS_CONF_OPTS = \
--disable-libdane \
--disable-rpath \
--disable-tests \
- --enable-local-libopts \
--enable-openssl-compatibility \
--without-libcrypto-prefix \
--without-libdl-prefix \
@@ -48,14 +47,6 @@ GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \
gl_cv_func_gettimeofday_clobber=no
GNUTLS_INSTALL_STAGING = YES
-# gnutls needs libregex, but pcre can be used too
-# The check isn't cross-compile friendly
-GNUTLS_CONF_ENV += libopts_cv_with_libregex=yes
-GNUTLS_CONF_OPTS += \
- --with-regex-header=pcreposix.h \
- --with-libregex-cflags="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --cflags`" \
- --with-libregex-libs="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --libs`"
-
ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
GNUTLS_CONF_OPTS += --enable-cryptodev
GNUTLS_DEPENDENCIES += cryptodev-linux
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 3/5] package/gnutls: remove redundant --enable-openssl-compatibility
2022-05-12 16:01 [Buildroot] [PATCH 1/5] package/gnutls: disable library search in /usr/lib Arnout Vandecappelle (Essensium/Mind)
2022-05-12 16:01 ` [Buildroot] [PATCH 2/5] package/gnutls: remove unused libregex dependency Arnout Vandecappelle (Essensium/Mind)
@ 2022-05-12 16:01 ` Arnout Vandecappelle (Essensium/Mind)
2022-05-12 20:53 ` Yann E. MORIN
2022-05-12 16:01 ` [Buildroot] [PATCH 4/5] package/gnutls: add optional dependency on brotli, zlib, zstd Arnout Vandecappelle (Essensium/Mind)
` (3 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Arnout Vandecappelle (Essensium/Mind) @ 2022-05-12 16:01 UTC (permalink / raw)
To: buildroot; +Cc: Matt Weber
The option is set a few lines below depending on
BR2_PACKAGE_GNUTLS_OPENSSL.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/gnutls/gnutls.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 79e7d529b1..1d997781b0 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -25,7 +25,6 @@ GNUTLS_CONF_OPTS = \
--disable-libdane \
--disable-rpath \
--disable-tests \
- --enable-openssl-compatibility \
--without-libcrypto-prefix \
--without-libdl-prefix \
--without-libev-prefix \
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 4/5] package/gnutls: add optional dependency on brotli, zlib, zstd
2022-05-12 16:01 [Buildroot] [PATCH 1/5] package/gnutls: disable library search in /usr/lib Arnout Vandecappelle (Essensium/Mind)
2022-05-12 16:01 ` [Buildroot] [PATCH 2/5] package/gnutls: remove unused libregex dependency Arnout Vandecappelle (Essensium/Mind)
2022-05-12 16:01 ` [Buildroot] [PATCH 3/5] package/gnutls: remove redundant --enable-openssl-compatibility Arnout Vandecappelle (Essensium/Mind)
@ 2022-05-12 16:01 ` Arnout Vandecappelle (Essensium/Mind)
2022-05-12 20:54 ` Yann E. MORIN
2022-05-12 16:01 ` [Buildroot] [PATCH 5/5] package/gnutls: libunistring is not optional Arnout Vandecappelle (Essensium/Mind)
` (2 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Arnout Vandecappelle (Essensium/Mind) @ 2022-05-12 16:01 UTC (permalink / raw)
To: buildroot; +Cc: Matt Weber
Version 3.7.4 added compression options with brotli, zlib and zstd.
These are automatically discovered, which makes their inclusion depend
on the build order. Therefore, explicitly enable/disable them.
Note that the configure help text says "--without-brotli" and
"--without-zstd", but the options are actually --without-libbrotli and
--without-libzstd. --without-zlib is correct in the help text.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
NOT for stable since 3.7.3 didn't have these yet.
---
package/gnutls/gnutls.mk | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 1d997781b0..0210d18597 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -46,6 +46,13 @@ GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \
gl_cv_func_gettimeofday_clobber=no
GNUTLS_INSTALL_STAGING = YES
+ifeq ($(BR2_PACKAGE_BROTLI),y)
+GNUTLS_CONF_OPTS += --with-libbrotli
+GNUTLS_DEPENDENCIES += brotli
+else
+GNUTLS_CONF_OPTS += --without-libbrotli
+endif
+
ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
GNUTLS_CONF_OPTS += --enable-cryptodev
GNUTLS_DEPENDENCIES += cryptodev-linux
@@ -71,6 +78,20 @@ else
GNUTLS_CONF_OPTS += --with-included-unistring
endif
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+GNUTLS_CONF_OPTS += --with-zlib
+GNUTLS_DEPENDENCIES += zlib
+else
+GNUTLS_CONF_OPTS += --without-zlib
+endif
+
+ifeq ($(BR2_PACKAGE_ZSTD),y)
+GNUTLS_CONF_OPTS += --with-libzstd
+GNUTLS_DEPENDENCIES += zstd
+else
+GNUTLS_CONF_OPTS += --without-libzstd
+endif
+
# Provide a default CA cert location
ifeq ($(BR2_PACKAGE_P11_KIT),y)
GNUTLS_CONF_OPTS += --with-default-trust-store-pkcs11=pkcs11:model=p11-kit-trust
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 5/5] package/gnutls: libunistring is not optional
2022-05-12 16:01 [Buildroot] [PATCH 1/5] package/gnutls: disable library search in /usr/lib Arnout Vandecappelle (Essensium/Mind)
` (2 preceding siblings ...)
2022-05-12 16:01 ` [Buildroot] [PATCH 4/5] package/gnutls: add optional dependency on brotli, zlib, zstd Arnout Vandecappelle (Essensium/Mind)
@ 2022-05-12 16:01 ` Arnout Vandecappelle (Essensium/Mind)
2022-05-12 20:55 ` Yann E. MORIN
2022-05-12 20:52 ` [Buildroot] [PATCH 1/5] package/gnutls: disable library search in /usr/lib Yann E. MORIN
2022-05-28 10:54 ` Peter Korsgaard
5 siblings, 1 reply; 11+ messages in thread
From: Arnout Vandecappelle (Essensium/Mind) @ 2022-05-12 16:01 UTC (permalink / raw)
To: buildroot; +Cc: Matt Weber
Since the very beginning, libunistring was a mandatory dependency of
gnutls. However, it would use its internal copy if libunistring was not
selected. We never want that, so make libunistring an actual mandatory
dependency.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/gnutls/Config.in | 5 ++---
package/gnutls/gnutls.mk | 9 ++-------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
index 28982b15a1..b3f9f5420b 100644
--- a/package/gnutls/Config.in
+++ b/package/gnutls/Config.in
@@ -2,10 +2,9 @@ config BR2_PACKAGE_GNUTLS
bool "gnutls"
# https://gitlab.com/gnutls/gnutls/issues/203
depends on !BR2_STATIC_LIBS
- # gnulib requires a library that implements wctomb().
- # This is noticed only when linking with libgnutls.so.
- depends on BR2_USE_WCHAR
+ depends on BR2_USE_WCHAR # libunistring
select BR2_PACKAGE_LIBTASN1
+ select BR2_PACKAGE_LIBUNISTRING
select BR2_PACKAGE_NETTLE
help
GnuTLS is a secure communications library implementing the SSL
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 0210d18597..89ab9b9476 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -17,7 +17,7 @@ GNUTLS_LICENSE += , GPL-3.0+ (gnutls-openssl library)
GNUTLS_LICENSE_FILES += doc/COPYING
endif
-GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle
+GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 libunistring nettle
GNUTLS_CPE_ID_VENDOR = gnu
GNUTLS_CONF_OPTS = \
--disable-doc \
@@ -25,6 +25,7 @@ GNUTLS_CONF_OPTS = \
--disable-libdane \
--disable-rpath \
--disable-tests \
+ --without-included-unistring \
--without-libcrypto-prefix \
--without-libdl-prefix \
--without-libev-prefix \
@@ -72,12 +73,6 @@ else
GNUTLS_CONF_OPTS += --without-p11-kit
endif
-ifeq ($(BR2_PACKAGE_LIBUNISTRING),y)
-GNUTLS_DEPENDENCIES += libunistring
-else
-GNUTLS_CONF_OPTS += --with-included-unistring
-endif
-
ifeq ($(BR2_PACKAGE_ZLIB),y)
GNUTLS_CONF_OPTS += --with-zlib
GNUTLS_DEPENDENCIES += zlib
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [Buildroot] [PATCH 1/5] package/gnutls: disable library search in /usr/lib
2022-05-12 16:01 [Buildroot] [PATCH 1/5] package/gnutls: disable library search in /usr/lib Arnout Vandecappelle (Essensium/Mind)
` (3 preceding siblings ...)
2022-05-12 16:01 ` [Buildroot] [PATCH 5/5] package/gnutls: libunistring is not optional Arnout Vandecappelle (Essensium/Mind)
@ 2022-05-12 20:52 ` Yann E. MORIN
2022-05-28 10:54 ` Peter Korsgaard
5 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2022-05-12 20:52 UTC (permalink / raw)
To: Arnout Vandecappelle (Essensium/Mind); +Cc: Matt Weber, buildroot
Arnout, All,
On 2022-05-12 18:01 +0200, Arnout Vandecappelle (Essensium/Mind) spake thusly:
> gnutls's configure script has a weird approach where it first searches
> for dependent libraries in the path specified by --prefix, before
> searching in the default search path. Since we set --prefix to /usr,
> and it doesn't take into account DESTDIR (which is anyway not set at
> configure time), that means it will first search /usr/lib before
> searching $(STAGING_DIR)/usr/lib.
>
> Ideally, this would be fixed in the configure script itself. However,
> the m4 file that does this is pretty complex, it's not immediately clear
> where to add $DESTDIR. In addition it comes from gnulib which is a
> somewhat annoying upstream.
>
> Therefore, instead, bypass the prefix lookup with
> --without-libfoo-prefix. Note that we could set
> --with-libfoo-prefix=$(STAGING_DIR)/usr (the latter is already done for
> librt and libpthread), but that's pretty pointless -
> --without-libfoo-prefix in fact reverts to what should have been done in
> the first place, i.e. use the toolchain search path.
>
> Add --without-libfoo-prefix for all options defined in configure (found
> with ./configure --help | grep without-.*-prefix). Most of these are
> only used in tests (e.g. libcrypto) or even not at all (e.g. libiconv),
> but it's fairly hard to discover this and to be sure that they are
> indeed not needed, so better pass all of them.
>
> Remove the now-redundant arguments for librt and libpthread.
>
> Add a comment to remind people to revisit these when bumping the
> version.
>
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> Cc: Peter Korsgaard <peter@korsgaard.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> This is for stable, but need to check if the same prefix options exist
> in 3.7.3.
> ---
> package/gnutls/gnutls.mk | 15 ++++++++++-----
> 1 file changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
> index 0e461cd44c..b5503b1fc9 100644
> --- a/package/gnutls/gnutls.mk
> +++ b/package/gnutls/gnutls.mk
> @@ -4,6 +4,7 @@
> #
> ################################################################################
>
> +# When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS
> GNUTLS_VERSION_MAJOR = 3.7
> GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).4
> GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
> @@ -26,7 +27,15 @@ GNUTLS_CONF_OPTS = \
> --disable-tests \
> --enable-local-libopts \
> --enable-openssl-compatibility \
> - --with-librt-prefix=$(STAGING_DIR) \
> + --without-libcrypto-prefix \
> + --without-libdl-prefix \
> + --without-libev-prefix \
> + --without-libiconv-prefix \
> + --without-libintl-prefix \
> + --without-libpthread-prefix \
> + --without-libseccomp-prefix \
> + --without-librt-prefix \
> + --without-libz-prefix \
> --without-tpm \
> $(if $(BR2_PACKAGE_GNUTLS_OPENSSL),--enable,--disable)-openssl-compatibility \
> $(if $(BR2_PACKAGE_GNUTLS_TOOLS),--enable-tools,--disable-tools) \
> @@ -39,9 +48,6 @@ GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \
> gl_cv_func_gettimeofday_clobber=no
> GNUTLS_INSTALL_STAGING = YES
>
> -# libpthread autodetection poison the linkpath
> -GNUTLS_CONF_OPTS += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr)
> -
> # gnutls needs libregex, but pcre can be used too
> # The check isn't cross-compile friendly
> GNUTLS_CONF_ENV += libopts_cv_with_libregex=yes
> @@ -70,7 +76,6 @@ GNUTLS_CONF_OPTS += --without-p11-kit
> endif
>
> ifeq ($(BR2_PACKAGE_LIBUNISTRING),y)
> -GNUTLS_CONF_OPTS += --with-libunistring-prefix=$(STAGING_DIR)/usr
> GNUTLS_DEPENDENCIES += libunistring
> else
> GNUTLS_CONF_OPTS += --with-included-unistring
> --
> 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] 11+ messages in thread
* Re: [Buildroot] [PATCH 2/5] package/gnutls: remove unused libregex dependency
2022-05-12 16:01 ` [Buildroot] [PATCH 2/5] package/gnutls: remove unused libregex dependency Arnout Vandecappelle (Essensium/Mind)
@ 2022-05-12 20:52 ` Yann E. MORIN
0 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2022-05-12 20:52 UTC (permalink / raw)
To: Arnout Vandecappelle (Essensium/Mind); +Cc: Matt Weber, buildroot
Arnout, All,
On 2022-05-12 18:01 +0200, Arnout Vandecappelle (Essensium/Mind) spake thusly:
> The pcre/libregex dependency was removed in version 3.7.3 with upstream
> commit 26578b7d02c269ff1d34ff782d84c7667734d03d, which removed the
> bundled libopts. Remove the pcre dependency and the relevant CONF_OPTS
> handling.
>
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> This is for stable since it's already the case for 3.7.3, the version in
> 2022.02.x
> ---
> package/gnutls/Config.in | 1 -
> package/gnutls/gnutls.mk | 11 +----------
> 2 files changed, 1 insertion(+), 11 deletions(-)
>
> diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
> index d57bb8d135..28982b15a1 100644
> --- a/package/gnutls/Config.in
> +++ b/package/gnutls/Config.in
> @@ -7,7 +7,6 @@ config BR2_PACKAGE_GNUTLS
> depends on BR2_USE_WCHAR
> select BR2_PACKAGE_LIBTASN1
> select BR2_PACKAGE_NETTLE
> - select BR2_PACKAGE_PCRE
> help
> GnuTLS is a secure communications library implementing the SSL
> and TLS protocols and technologies around them.
> diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
> index b5503b1fc9..79e7d529b1 100644
> --- a/package/gnutls/gnutls.mk
> +++ b/package/gnutls/gnutls.mk
> @@ -17,7 +17,7 @@ GNUTLS_LICENSE += , GPL-3.0+ (gnutls-openssl library)
> GNUTLS_LICENSE_FILES += doc/COPYING
> endif
>
> -GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle pcre
> +GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle
> GNUTLS_CPE_ID_VENDOR = gnu
> GNUTLS_CONF_OPTS = \
> --disable-doc \
> @@ -25,7 +25,6 @@ GNUTLS_CONF_OPTS = \
> --disable-libdane \
> --disable-rpath \
> --disable-tests \
> - --enable-local-libopts \
> --enable-openssl-compatibility \
> --without-libcrypto-prefix \
> --without-libdl-prefix \
> @@ -48,14 +47,6 @@ GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \
> gl_cv_func_gettimeofday_clobber=no
> GNUTLS_INSTALL_STAGING = YES
>
> -# gnutls needs libregex, but pcre can be used too
> -# The check isn't cross-compile friendly
> -GNUTLS_CONF_ENV += libopts_cv_with_libregex=yes
> -GNUTLS_CONF_OPTS += \
> - --with-regex-header=pcreposix.h \
> - --with-libregex-cflags="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --cflags`" \
> - --with-libregex-libs="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --libs`"
> -
> ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
> GNUTLS_CONF_OPTS += --enable-cryptodev
> GNUTLS_DEPENDENCIES += cryptodev-linux
> --
> 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] 11+ messages in thread
* Re: [Buildroot] [PATCH 3/5] package/gnutls: remove redundant --enable-openssl-compatibility
2022-05-12 16:01 ` [Buildroot] [PATCH 3/5] package/gnutls: remove redundant --enable-openssl-compatibility Arnout Vandecappelle (Essensium/Mind)
@ 2022-05-12 20:53 ` Yann E. MORIN
0 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2022-05-12 20:53 UTC (permalink / raw)
To: Arnout Vandecappelle (Essensium/Mind); +Cc: Matt Weber, buildroot
Arnout, All,
On 2022-05-12 18:01 +0200, Arnout Vandecappelle (Essensium/Mind) spake thusly:
> The option is set a few lines below depending on
> BR2_PACKAGE_GNUTLS_OPENSSL.
I've moved all the openssl compatibility stuff under a single
conditional block.
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> package/gnutls/gnutls.mk | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
> index 79e7d529b1..1d997781b0 100644
> --- a/package/gnutls/gnutls.mk
> +++ b/package/gnutls/gnutls.mk
> @@ -25,7 +25,6 @@ GNUTLS_CONF_OPTS = \
> --disable-libdane \
> --disable-rpath \
> --disable-tests \
> - --enable-openssl-compatibility \
> --without-libcrypto-prefix \
> --without-libdl-prefix \
> --without-libev-prefix \
> --
> 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] 11+ messages in thread
* Re: [Buildroot] [PATCH 4/5] package/gnutls: add optional dependency on brotli, zlib, zstd
2022-05-12 16:01 ` [Buildroot] [PATCH 4/5] package/gnutls: add optional dependency on brotli, zlib, zstd Arnout Vandecappelle (Essensium/Mind)
@ 2022-05-12 20:54 ` Yann E. MORIN
0 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2022-05-12 20:54 UTC (permalink / raw)
To: Arnout Vandecappelle (Essensium/Mind); +Cc: Matt Weber, buildroot
Arnout, All,
On 2022-05-12 18:01 +0200, Arnout Vandecappelle (Essensium/Mind) spake thusly:
> Version 3.7.4 added compression options with brotli, zlib and zstd.
> These are automatically discovered, which makes their inclusion depend
> on the build order. Therefore, explicitly enable/disable them.
>
> Note that the configure help text says "--without-brotli" and
> "--without-zstd", but the options are actually --without-libbrotli and
> --without-libzstd. --without-zlib is correct in the help text.
>
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> NOT for stable since 3.7.3 didn't have these yet.
> ---
> package/gnutls/gnutls.mk | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
> index 1d997781b0..0210d18597 100644
> --- a/package/gnutls/gnutls.mk
> +++ b/package/gnutls/gnutls.mk
> @@ -46,6 +46,13 @@ GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \
> gl_cv_func_gettimeofday_clobber=no
> GNUTLS_INSTALL_STAGING = YES
>
> +ifeq ($(BR2_PACKAGE_BROTLI),y)
> +GNUTLS_CONF_OPTS += --with-libbrotli
> +GNUTLS_DEPENDENCIES += brotli
> +else
> +GNUTLS_CONF_OPTS += --without-libbrotli
> +endif
> +
> ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
> GNUTLS_CONF_OPTS += --enable-cryptodev
> GNUTLS_DEPENDENCIES += cryptodev-linux
> @@ -71,6 +78,20 @@ else
> GNUTLS_CONF_OPTS += --with-included-unistring
> endif
>
> +ifeq ($(BR2_PACKAGE_ZLIB),y)
> +GNUTLS_CONF_OPTS += --with-zlib
> +GNUTLS_DEPENDENCIES += zlib
> +else
> +GNUTLS_CONF_OPTS += --without-zlib
> +endif
> +
> +ifeq ($(BR2_PACKAGE_ZSTD),y)
> +GNUTLS_CONF_OPTS += --with-libzstd
> +GNUTLS_DEPENDENCIES += zstd
> +else
> +GNUTLS_CONF_OPTS += --without-libzstd
> +endif
> +
> # Provide a default CA cert location
> ifeq ($(BR2_PACKAGE_P11_KIT),y)
> GNUTLS_CONF_OPTS += --with-default-trust-store-pkcs11=pkcs11:model=p11-kit-trust
> --
> 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] 11+ messages in thread
* Re: [Buildroot] [PATCH 5/5] package/gnutls: libunistring is not optional
2022-05-12 16:01 ` [Buildroot] [PATCH 5/5] package/gnutls: libunistring is not optional Arnout Vandecappelle (Essensium/Mind)
@ 2022-05-12 20:55 ` Yann E. MORIN
0 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2022-05-12 20:55 UTC (permalink / raw)
To: Arnout Vandecappelle (Essensium/Mind); +Cc: Matt Weber, buildroot
Arnout, All,
On 2022-05-12 18:01 +0200, Arnout Vandecappelle (Essensium/Mind) spake thusly:
> Since the very beginning, libunistring was a mandatory dependency of
> gnutls. However, it would use its internal copy if libunistring was not
> selected. We never want that, so make libunistring an actual mandatory
> dependency.
>
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
> package/gnutls/Config.in | 5 ++---
> package/gnutls/gnutls.mk | 9 ++-------
> 2 files changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
> index 28982b15a1..b3f9f5420b 100644
> --- a/package/gnutls/Config.in
> +++ b/package/gnutls/Config.in
> @@ -2,10 +2,9 @@ config BR2_PACKAGE_GNUTLS
> bool "gnutls"
> # https://gitlab.com/gnutls/gnutls/issues/203
> depends on !BR2_STATIC_LIBS
> - # gnulib requires a library that implements wctomb().
> - # This is noticed only when linking with libgnutls.so.
> - depends on BR2_USE_WCHAR
> + depends on BR2_USE_WCHAR # libunistring
In fact, the wchar dependency is for gnutls itself; the source code is
littered with wchar_t everywhere, so I jsut dropped the comment.
Applied to master, thanks.
Regards,
Yann E. MORIN.
> select BR2_PACKAGE_LIBTASN1
> + select BR2_PACKAGE_LIBUNISTRING
> select BR2_PACKAGE_NETTLE
> help
> GnuTLS is a secure communications library implementing the SSL
> diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
> index 0210d18597..89ab9b9476 100644
> --- a/package/gnutls/gnutls.mk
> +++ b/package/gnutls/gnutls.mk
> @@ -17,7 +17,7 @@ GNUTLS_LICENSE += , GPL-3.0+ (gnutls-openssl library)
> GNUTLS_LICENSE_FILES += doc/COPYING
> endif
>
> -GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle
> +GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 libunistring nettle
> GNUTLS_CPE_ID_VENDOR = gnu
> GNUTLS_CONF_OPTS = \
> --disable-doc \
> @@ -25,6 +25,7 @@ GNUTLS_CONF_OPTS = \
> --disable-libdane \
> --disable-rpath \
> --disable-tests \
> + --without-included-unistring \
> --without-libcrypto-prefix \
> --without-libdl-prefix \
> --without-libev-prefix \
> @@ -72,12 +73,6 @@ else
> GNUTLS_CONF_OPTS += --without-p11-kit
> endif
>
> -ifeq ($(BR2_PACKAGE_LIBUNISTRING),y)
> -GNUTLS_DEPENDENCIES += libunistring
> -else
> -GNUTLS_CONF_OPTS += --with-included-unistring
> -endif
> -
> ifeq ($(BR2_PACKAGE_ZLIB),y)
> GNUTLS_CONF_OPTS += --with-zlib
> GNUTLS_DEPENDENCIES += zlib
> --
> 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] 11+ messages in thread
* Re: [Buildroot] [PATCH 1/5] package/gnutls: disable library search in /usr/lib
2022-05-12 16:01 [Buildroot] [PATCH 1/5] package/gnutls: disable library search in /usr/lib Arnout Vandecappelle (Essensium/Mind)
` (4 preceding siblings ...)
2022-05-12 20:52 ` [Buildroot] [PATCH 1/5] package/gnutls: disable library search in /usr/lib Yann E. MORIN
@ 2022-05-28 10:54 ` Peter Korsgaard
5 siblings, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2022-05-28 10:54 UTC (permalink / raw)
To: Arnout Vandecappelle (Essensium/Mind); +Cc: Matt Weber, buildroot
>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes:
> gnutls's configure script has a weird approach where it first searches
> for dependent libraries in the path specified by --prefix, before
> searching in the default search path. Since we set --prefix to /usr,
> and it doesn't take into account DESTDIR (which is anyway not set at
> configure time), that means it will first search /usr/lib before
> searching $(STAGING_DIR)/usr/lib.
> Ideally, this would be fixed in the configure script itself. However,
> the m4 file that does this is pretty complex, it's not immediately clear
> where to add $DESTDIR. In addition it comes from gnulib which is a
> somewhat annoying upstream.
> Therefore, instead, bypass the prefix lookup with
> --without-libfoo-prefix. Note that we could set
> --with-libfoo-prefix=$(STAGING_DIR)/usr (the latter is already done for
> librt and libpthread), but that's pretty pointless -
> --without-libfoo-prefix in fact reverts to what should have been done in
> the first place, i.e. use the toolchain search path.
> Add --without-libfoo-prefix for all options defined in configure (found
> with ./configure --help | grep without-.*-prefix). Most of these are
> only used in tests (e.g. libcrypto) or even not at all (e.g. libiconv),
> but it's fairly hard to discover this and to be sure that they are
> indeed not needed, so better pass all of them.
> Remove the now-redundant arguments for librt and libpthread.
> Add a comment to remind people to revisit these when bumping the
> version.
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> Cc: Peter Korsgaard <peter@korsgaard.com>
> ---
> This is for stable, but need to check if the same prefix options exist
> in 3.7.3.
I instead bumped 2022.02.x to 3.7.4 as it contains fixes and applied the
entire series 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] 11+ messages in thread
end of thread, other threads:[~2022-05-28 10:54 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-12 16:01 [Buildroot] [PATCH 1/5] package/gnutls: disable library search in /usr/lib Arnout Vandecappelle (Essensium/Mind)
2022-05-12 16:01 ` [Buildroot] [PATCH 2/5] package/gnutls: remove unused libregex dependency Arnout Vandecappelle (Essensium/Mind)
2022-05-12 20:52 ` Yann E. MORIN
2022-05-12 16:01 ` [Buildroot] [PATCH 3/5] package/gnutls: remove redundant --enable-openssl-compatibility Arnout Vandecappelle (Essensium/Mind)
2022-05-12 20:53 ` Yann E. MORIN
2022-05-12 16:01 ` [Buildroot] [PATCH 4/5] package/gnutls: add optional dependency on brotli, zlib, zstd Arnout Vandecappelle (Essensium/Mind)
2022-05-12 20:54 ` Yann E. MORIN
2022-05-12 16:01 ` [Buildroot] [PATCH 5/5] package/gnutls: libunistring is not optional Arnout Vandecappelle (Essensium/Mind)
2022-05-12 20:55 ` Yann E. MORIN
2022-05-12 20:52 ` [Buildroot] [PATCH 1/5] package/gnutls: disable library search in /usr/lib Yann E. MORIN
2022-05-28 10:54 ` 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.