[Buildroot] [PATCH 1/1] package/gnutls: add patch to fix build failure

[Buildroot] [PATCH 1/1] package/gnutls: add patch to fix build failure

[TIAN Yuanhao]

This patch needs to be applied before [1], otherwise it will cause the
following build failure:

  In file included from dlwrap/zstd.c:12:
  dlwrap/zstd.h:11:10: fatal error: zstd.h: No such file or directory
     11 | #include <zstd.h>
        |          ^~~~~~~~
  compilation terminated.

  In file included from dlwrap/brotlienc.c:12:
  dlwrap/brotlienc.h:11:10: fatal error: brotli/encode.h: No such file or directory
     11 | #include <brotli/encode.h>
        |          ^~~~~~~~~~~~~~~~~
  compilation terminated.

  In file included from dlwrap/brotlidec.c:12:
  dlwrap/brotlidec.h:11:10: fatal error: brotli/decode.h: No such file or directory
     11 | #include <brotli/decode.h>
        |          ^~~~~~~~~~~~~~~~~
  compilation terminated.

[1]: https://patchwork.ozlabs.org/project/buildroot/patch/20240912113855.3983-1-tianyuanhao3@163.com/

Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
Cc: Francois Perrad <francois.perrad@gadz.org>

---

After version 3.8.7, configure.ac made many changes [2] [3], that
indirectly fixed this issue.

[2]: https://github.com/gnutls/gnutls/commit/1a80e038da2bd0dd7948cb7278a28905fb5311a6
[3]: https://github.com/gnutls/gnutls/commit/63b16acfafcff014f227509dac9075348a6d118b
---
 ...TLI_TRUE-and-HAVE_LIBZSTD_TRUE-value.patch | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 package/gnutls/0001-Fix-HAVE_LIBBROTLI_TRUE-and-HAVE_LIBZSTD_TRUE-value.patch

diff --git a/package/gnutls/0001-Fix-HAVE_LIBBROTLI_TRUE-and-HAVE_LIBZSTD_TRUE-value.patch b/package/gnutls/0001-Fix-HAVE_LIBBROTLI_TRUE-and-HAVE_LIBZSTD_TRUE-value.patch
new file mode 100644
index 0000000000..b389e387e4
--- /dev/null
+++ b/package/gnutls/0001-Fix-HAVE_LIBBROTLI_TRUE-and-HAVE_LIBZSTD_TRUE-value.patch
@@ -0,0 +1,32 @@
+Fix HAVE_LIBBROTLI_TRUE and HAVE_LIBZSTD_TRUE value
+
+"with_libbrotlienc", "with_libbrotlidec" and "with_libzstd" may be
+empty, which is equivalent to "no".
+
+Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
+---
+ configure.ac |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: gnutls-3.8.7/configure.ac
+===================================================================
+--- gnutls-3.8.7.orig/configure.ac
++++ gnutls-3.8.7/configure.ac
+@@ -1158,7 +1158,7 @@ if test x$ac_brotli != xno; then
+ else
+     AC_MSG_RESULT(no)
+ fi
+-AM_CONDITIONAL(HAVE_LIBBROTLI, test "$with_libbrotlienc" != "no" && test "$with_libbrotlidec" != "no")
++AM_CONDITIONAL(HAVE_LIBBROTLI, test "$with_libbrotlienc" = "yes" && test "$with_libbrotlidec" = "yes")
+ 
+ AS_IF([test "$ac_cv_dlopen_soname_works" = yes], [
+     save_CFLAGS=$CFLAGS
+@@ -1203,7 +1203,7 @@ if test x$ac_zstd != xno; then
+ else
+     AC_MSG_RESULT(no)
+ fi
+-AM_CONDITIONAL(HAVE_LIBZSTD, test "$with_libzstd" != "no")
++AM_CONDITIONAL(HAVE_LIBZSTD, test "$with_libzstd" = "yes")
+ 
+ AS_IF([test "$ac_cv_dlopen_soname_works" = yes], [
+     save_CFLAGS=$CFLAGS
-- 
2.45.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/gnutls: add patch to fix build failure

[Thomas Petazzoni via buildroot]

Hello,

On Wed,  9 Oct 2024 04:34:10 -0700
TIAN Yuanhao <tianyuanhao3@163.com> wrote:

> This patch needs to be applied before [1], otherwise it will cause the
> following build failure:

Could you then send both patches in a series?

> diff --git a/package/gnutls/0001-Fix-HAVE_LIBBROTLI_TRUE-and-HAVE_LIBZSTD_TRUE-value.patch b/package/gnutls/0001-Fix-HAVE_LIBBROTLI_TRUE-and-HAVE_LIBZSTD_TRUE-value.patch
> new file mode 100644
> index 0000000000..b389e387e4
> --- /dev/null
> +++ b/package/gnutls/0001-Fix-HAVE_LIBBROTLI_TRUE-and-HAVE_LIBZSTD_TRUE-value.patch
> @@ -0,0 +1,32 @@
> +Fix HAVE_LIBBROTLI_TRUE and HAVE_LIBZSTD_TRUE value
> +
> +"with_libbrotlienc", "with_libbrotlidec" and "with_libzstd" may be
> +empty, which is equivalent to "no".
> +
> +Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>

If you run "make check-package", this should give you a warning that
you don't have an Upstream: tag. Has this patch been submitted
upstream? If not, you should do it. If yes, you should include an
Upstream: tag with a link to the upstream submission.

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot