summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/gnutls/gnutls.inc3
-rw-r--r--meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch75
-rw-r--r--meta/recipes-support/gnutls/gnutls_3.5.16.bb10
-rw-r--r--meta/recipes-support/gnutls/gnutls_3.6.1.bb9
4 files changed, 10 insertions, 87 deletions
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index 29b5dd6ae7..7bcb9133ad 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -21,7 +21,7 @@ SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz"
21 21
22inherit autotools texinfo binconfig pkgconfig gettext lib_package gtk-doc 22inherit autotools texinfo binconfig pkgconfig gettext lib_package gtk-doc
23 23
24PACKAGECONFIG ??= "libidn zlib" 24PACKAGECONFIG ??= "libidn"
25 25
26# You must also have CONFIG_SECCOMP enabled in the kernel for 26# You must also have CONFIG_SECCOMP enabled in the kernel for
27# seccomp to work. 27# seccomp to work.
@@ -32,7 +32,6 @@ PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn"
32PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" 32PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1"
33PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" 33PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit"
34PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" 34PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers"
35PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
36 35
37EXTRA_OECONF = " \ 36EXTRA_OECONF = " \
38 --enable-doc \ 37 --enable-doc \
diff --git a/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch b/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch
deleted file mode 100644
index ae141a5bcd..0000000000
--- a/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch
+++ /dev/null
@@ -1,75 +0,0 @@
1From 18081068a97c00015aabc5fa321664951458ea0d Mon Sep 17 00:00:00 2001
2From: Fan Xin <fan.xin@jp.fujitsu.com>
3Date: Fri, 9 Jun 2017 15:20:31 +0900
4Subject: [PATCH] From cee80af1fe93f5b76765afeebfcc3b902768f5d6 Mon Sep 17
5 00:00:00 2001 From: Andre McCurdy <armccurdy@gmail.com> Date: Tue, 26 May
6 2015 21:41:24 -0700 Subject: [PATCH] use pkg-config to locate zlib
7
8AC_LIB_HAVE_LINKFLAGS can sometimes find host libs and is therefore not
9robust when cross-compiling. Remove it for zlib and use PKG_CHECK_MODULES
10instead.
11
12Removing AC_LIB_HAVE_LINKFLAGS for zlib also removes the --with-libz-prefix
13configure option. If zlib support is enabled, then failure to find zlib via
14pkg-config is now treated as a fatal error.
15
16Change based on ChromeOS gnutls 2.12.23 cross-compile fixes patch:
17
18 https://chromium-review.googlesource.com/#/c/271661/
19
20Upstream-Status: Inappropriate [configuration]
21
22Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
23
24Rebase on gnutls 3.5.13
25
26Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
27---
28 configure.ac | 25 +++++++++----------------
29 1 file changed, 9 insertions(+), 16 deletions(-)
30
31diff --git a/configure.ac b/configure.ac
32index c65268e..f6a18aa 100644
33--- a/configure.ac
34+++ b/configure.ac
35@@ -735,28 +735,21 @@ AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib],
36 AC_MSG_CHECKING([whether to include zlib compression support])
37 if test x$ac_zlib != xno; then
38 AC_MSG_RESULT(yes)
39- AC_LIB_HAVE_LINKFLAGS(z,, [#include <zlib.h>], [compress (0, 0, 0, 0);])
40- if test x$ac_cv_libz != xyes; then
41- AC_MSG_WARN(
42-***
43-*** ZLIB was not found. You will not be able to use ZLIB compression.)
44- fi
45 else
46 AC_MSG_RESULT(no)
47 fi
48
49-PKG_CHECK_EXISTS(zlib, ZLIB_HAS_PKGCONFIG=y, ZLIB_HAS_PKGCONFIG=n)
50-
51 if test x$ac_zlib != xno; then
52- if test "$ZLIB_HAS_PKGCONFIG" = "y" ; then
53- if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then
54- GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
55- else
56- GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib"
57- fi
58- LIBZ_PC=""
59+ PKG_CHECK_MODULES(ZLIB, zlib)
60+ HAVE_LIBZ=yes
61+ AC_DEFINE([HAVE_LIBZ], [1], [zlib is enabled])
62+ AC_SUBST(HAVE_LIBZ)
63+ LTLIBZ=$ZLIB_LIBS
64+ AC_SUBST(LTLIBZ)
65+ if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then
66+ GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
67 else
68- LIBZ_PC=$LIBZ
69+ GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib"
70 fi
71 fi
72 AC_SUBST(LIBZ_PC)
73--
741.9.1
75
diff --git a/meta/recipes-support/gnutls/gnutls_3.5.16.bb b/meta/recipes-support/gnutls/gnutls_3.5.16.bb
deleted file mode 100644
index 635c519302..0000000000
--- a/meta/recipes-support/gnutls/gnutls_3.5.16.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require gnutls.inc
2
3SRC_URI += "file://0001-configure.ac-fix-sed-command.patch \
4 file://use-pkg-config-to-locate-zlib.patch \
5 file://arm_eabi.patch \
6 "
7SRC_URI[md5sum] = "4c39612f1ec3ef7ed79cfb8936fa8143"
8SRC_URI[sha256sum] = "0924dec90c37c05f49fec966eba3672dab4d336d879e5c06e06e13325cbfec25"
9
10BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-support/gnutls/gnutls_3.6.1.bb b/meta/recipes-support/gnutls/gnutls_3.6.1.bb
new file mode 100644
index 0000000000..7624a203d4
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls_3.6.1.bb
@@ -0,0 +1,9 @@
1require gnutls.inc
2
3SRC_URI += "file://0001-configure.ac-fix-sed-command.patch \
4 file://arm_eabi.patch \
5 "
6SRC_URI[md5sum] = "4b65ae3ffef59f3eeed51a6166ff12b3"
7SRC_URI[sha256sum] = "20b10d2c9994bc032824314714d0e84c0f19bdb3d715d8ed55beb7364a8ebaed"
8
9BBCLASSEXTEND = "native nativesdk"