From 537325f204f2f7c66f13a12dc8fc08f8e16e4754 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Tue, 21 Nov 2017 12:01:32 -0800 Subject: gnutls: update to 3.6.1 zlib configure.ac support removed in 3.6.1 drop patch Signed-off-by: Armin Kuster Signed-off-by: Ross Burton --- meta/recipes-support/gnutls/gnutls.inc | 3 +- .../gnutls/use-pkg-config-to-locate-zlib.patch | 75 ---------------------- meta/recipes-support/gnutls/gnutls_3.5.16.bb | 10 --- meta/recipes-support/gnutls/gnutls_3.6.1.bb | 9 +++ 4 files changed, 10 insertions(+), 87 deletions(-) delete mode 100644 meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch delete mode 100644 meta/recipes-support/gnutls/gnutls_3.5.16.bb create mode 100644 meta/recipes-support/gnutls/gnutls_3.6.1.bb 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" inherit autotools texinfo binconfig pkgconfig gettext lib_package gtk-doc -PACKAGECONFIG ??= "libidn zlib" +PACKAGECONFIG ??= "libidn" # You must also have CONFIG_SECCOMP enabled in the kernel for # seccomp to work. @@ -32,7 +32,6 @@ PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn" PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" -PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" EXTRA_OECONF = " \ --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 @@ -From 18081068a97c00015aabc5fa321664951458ea0d Mon Sep 17 00:00:00 2001 -From: Fan Xin -Date: Fri, 9 Jun 2017 15:20:31 +0900 -Subject: [PATCH] From cee80af1fe93f5b76765afeebfcc3b902768f5d6 Mon Sep 17 - 00:00:00 2001 From: Andre McCurdy Date: Tue, 26 May - 2015 21:41:24 -0700 Subject: [PATCH] use pkg-config to locate zlib - -AC_LIB_HAVE_LINKFLAGS can sometimes find host libs and is therefore not -robust when cross-compiling. Remove it for zlib and use PKG_CHECK_MODULES -instead. - -Removing AC_LIB_HAVE_LINKFLAGS for zlib also removes the --with-libz-prefix -configure option. If zlib support is enabled, then failure to find zlib via -pkg-config is now treated as a fatal error. - -Change based on ChromeOS gnutls 2.12.23 cross-compile fixes patch: - - https://chromium-review.googlesource.com/#/c/271661/ - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andre McCurdy - -Rebase on gnutls 3.5.13 - -Signed-off-by: Fan Xin ---- - configure.ac | 25 +++++++++---------------- - 1 file changed, 9 insertions(+), 16 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c65268e..f6a18aa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -735,28 +735,21 @@ AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib], - AC_MSG_CHECKING([whether to include zlib compression support]) - if test x$ac_zlib != xno; then - AC_MSG_RESULT(yes) -- AC_LIB_HAVE_LINKFLAGS(z,, [#include ], [compress (0, 0, 0, 0);]) -- if test x$ac_cv_libz != xyes; then -- AC_MSG_WARN( --*** --*** ZLIB was not found. You will not be able to use ZLIB compression.) -- fi - else - AC_MSG_RESULT(no) - fi - --PKG_CHECK_EXISTS(zlib, ZLIB_HAS_PKGCONFIG=y, ZLIB_HAS_PKGCONFIG=n) -- - if test x$ac_zlib != xno; then -- if test "$ZLIB_HAS_PKGCONFIG" = "y" ; then -- if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then -- GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib" -- else -- GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib" -- fi -- LIBZ_PC="" -+ PKG_CHECK_MODULES(ZLIB, zlib) -+ HAVE_LIBZ=yes -+ AC_DEFINE([HAVE_LIBZ], [1], [zlib is enabled]) -+ AC_SUBST(HAVE_LIBZ) -+ LTLIBZ=$ZLIB_LIBS -+ AC_SUBST(LTLIBZ) -+ if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then -+ GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib" - else -- LIBZ_PC=$LIBZ -+ GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib" - fi - fi - AC_SUBST(LIBZ_PC) --- -1.9.1 - 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 @@ -require gnutls.inc - -SRC_URI += "file://0001-configure.ac-fix-sed-command.patch \ - file://use-pkg-config-to-locate-zlib.patch \ - file://arm_eabi.patch \ - " -SRC_URI[md5sum] = "4c39612f1ec3ef7ed79cfb8936fa8143" -SRC_URI[sha256sum] = "0924dec90c37c05f49fec966eba3672dab4d336d879e5c06e06e13325cbfec25" - -BBCLASSEXTEND = "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 @@ +require gnutls.inc + +SRC_URI += "file://0001-configure.ac-fix-sed-command.patch \ + file://arm_eabi.patch \ + " +SRC_URI[md5sum] = "4b65ae3ffef59f3eeed51a6166ff12b3" +SRC_URI[sha256sum] = "20b10d2c9994bc032824314714d0e84c0f19bdb3d715d8ed55beb7364a8ebaed" + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg