diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
| commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
| tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /net-libs/gnutls/files | |
| parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) | |
gentoo resync : 20.03.2022
Diffstat (limited to 'net-libs/gnutls/files')
| -rw-r--r-- | net-libs/gnutls/files/gnutls-3.7.4-configure-compression.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/net-libs/gnutls/files/gnutls-3.7.4-configure-compression.patch b/net-libs/gnutls/files/gnutls-3.7.4-configure-compression.patch new file mode 100644 index 000000000000..edd688d9b58a --- /dev/null +++ b/net-libs/gnutls/files/gnutls-3.7.4-configure-compression.patch @@ -0,0 +1,63 @@ +https://gitlab.com/gnutls/gnutls/-/merge_requests/1557 + +From: Sam James <sam@gentoo.org> +Date: Fri, 18 Mar 2022 05:40:28 +0000 +Subject: [PATCH 1/2] configure.ac: fix brotli/zstd configure argument name + +The old `./configure` arguments for brotli and zstd respectively +were inconsistent with the `./configure --help` output. + +Old: --without-libbrotli --without-libzstd (also --with-*) +New: --without-brotli --without-zstd (also --with-*) + +Fixes: https://gitlab.com/gnutls/gnutls/-/issues/1342 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -1010,7 +1010,7 @@ if test x$ac_zlib != xno; then + fi + AC_SUBST(LIBZ_PC) + +-AC_ARG_WITH(libbrotli, ++AC_ARG_WITH(brotli, + AS_HELP_STRING([--without-brotli], [disable brotli compression support]), + ac_brotli=$withval, ac_brotli=yes) + AC_MSG_CHECKING([whether to include brotli compression support]) +@@ -1033,7 +1033,7 @@ else + fi + AM_CONDITIONAL(HAVE_LIBBROTLI, test "$with_libbrotlienc" != "no" && test "$with_libbrotlidec" != "no") + +-AC_ARG_WITH(libzstd, ++AC_ARG_WITH(zstd, + AS_HELP_STRING([--without-zstd], [disable zstd compression support]), + ac_zstd=$withval, ac_zstd=yes) + AC_MSG_CHECKING([whether to include zstd compression support]) +GitLab + +From: Sam James <sam@gentoo.org> +Date: Fri, 18 Mar 2022 05:51:29 +0000 +Subject: [PATCH 2/2] configure.ac: fix zstd detection + +Fixes typo in zstd detection. + +None of the used autoconf macros will define `has_zstd_h` so +configure will (AFAICT) always fail to find zstd, even if it succeeded +via pkg-config moments before. + +Drop it and rely solely on pkg-config as that's the only search +we're actually doing. + +Fixes: https://gitlab.com/gnutls/gnutls/-/issues/1343 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -1040,7 +1040,7 @@ AC_MSG_CHECKING([whether to include zstd compression support]) + if test x$ac_zstd != xno; then + AC_MSG_RESULT(yes) + PKG_CHECK_MODULES(LIBZSTD, [libzstd >= 1.3.0], [with_libzstd=yes], [with_libzstd=no]) +- if test "${with_libzstd}" = "yes" && test "${has_zstd_h}" = "yes"; then ++ if test "${with_libzstd}" = "yes"; then + AC_DEFINE([HAVE_LIBZSTD], 1, [Define if ZSTD compression is enabled.]) + if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then + GNUTLS_REQUIRES_PRIVATE="Requires.private: libzstd" +GitLab |