gnutls: old oe hacks

diff --git a/recipes/gnutls/gnutls-2.12.24/no_AM_PROG_AR.patch b/recipes/gnutls/gnutls-2.12.24/no_AM_PROG_AR.patch
new file mode 100644 (file)
index 0000000..e3cc20f
--- /dev/null
+++ b/recipes/gnutls/gnutls-2.12.24/no_AM_PROG_AR.patch
@@ -0,0 +1,33 @@
+diff -ur gnutls-2.12.24.orig/configure.ac gnutls-2.12.24/configure.ac
+--- gnutls-2.12.24.orig/configure.ac   2016-11-04 08:54:47.000000000 +0200
++++ gnutls-2.12.24/configure.ac        2017-10-21 20:26:40.760890806 +0300
+@@ -37,7 +37,6 @@
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_LN_S
+-AM_PROG_AR
+ 
+ GTK_DOC_CHECK(1.1)
+ AC_PATH_PROG([GAA], [gaa])
+diff -ur gnutls-2.12.24.orig/lib/configure.ac gnutls-2.12.24/lib/configure.ac
+--- gnutls-2.12.24.orig/lib/configure.ac       2017-10-21 20:28:25.471498874 +0300
++++ gnutls-2.12.24/lib/configure.ac    2017-10-21 20:30:28.781863670 +0300
+@@ -31,7 +31,6 @@
+ AC_CONFIG_HEADERS([config.h])
+ 
+ AC_PROG_CC
+-AM_PROG_AR
+ lgl_EARLY
+ 
+ AC_LIBTOOL_WIN32_DLL
+diff -ur gnutls-2.12.24.orig/libextra/configure.ac gnutls-2.12.24/libextra/configure.ac
+--- gnutls-2.12.24.orig/libextra/configure.ac  2017-10-21 20:28:25.355500415 +0300
++++ gnutls-2.12.24/libextra/configure.ac       2017-10-21 20:30:32.821810159 +0300
+@@ -31,7 +31,6 @@
+ AC_CONFIG_HEADERS([config.h])
+ 
+ AC_PROG_CC
+-AM_PROG_AR
+ xgl_EARLY
+ 
+ AC_LIBTOOL_WIN32_DLL

diff --git a/recipes/gnutls/gnutls.inc b/recipes/gnutls/gnutls.inc
index ccf6f69..87152c4 100644 (file)
--- a/recipes/gnutls/gnutls.inc
+++ b/recipes/gnutls/gnutls.inc
@@ -1,27 +1,45 @@
 DESCRIPTION = "GNU Transport Layer Security Library"
 HOMEPAGE = "http://www.gnu.org/software/gnutls/"
-DEPENDS = "zlib libgcrypt lzo guile-native gettext gtk-doc"
-LICENSE = "LGPL"
-
-SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls"
-
-inherit autotools binconfig pkgconfig
-
-INC_PR = "r9"
-
-EXTRA_OECONF = "--with-included-opencdk --with-included-libtasn1"
-
-PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin ${PN}-xx"
-
-FILES_${PN} = "${libdir}/libgnutls.so.*"
-FILES_${PN}-bin = "${bindir}/gnutls-serv \
-                   ${bindir}/gnutls-cli \
-                   ${bindir}/srptool \
-                   ${bindir}/psktool \
-                   ${bindir}/certtool \
-                   ${bindir}/gnutls-srpcrypt"
-
-FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug"
+BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls"
+DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) readline"
+
+INC_PR = "r8"
+
+LICENSE = "GPLv3+ LGPLv2.1+"
+LICENSE_${PN} = "LGPLv2.1+"
+LICENSE_${PN}-xx = "LGPLv2.1+"
+LICENSE_${PN}-bin = "GPLv3+"
+LICENSE_${PN}-extra = "GPLv3+"
+LICENSE_${PN}-openssl = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://lib/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
+                    file://libextra/COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
+
+SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.bz2"
+
+inherit autotools binconfig pkgconfig gettext lib_package
+
+EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \
+              --with-libtasn1-prefix=${STAGING_DIR_HOST}${prefix} \
+              --with-libgcrypt --with-libgcrypt-prefix=${STAGING_DIR_HOST}${prefix} \
+              --with-libdl-prefix=${STAGING_DIR_HOST}${prefix} \
+              --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
+              --with-libreadline-prefix=${STAGING_DIR_HOST}${prefix} \
+              --with-libz-prefix=${STAGING_DIR_HOST}${prefix} \
+              --with-lzo --disable-guile \
+              --without-p11-kit \
+              "
+do_configure_prepend() {
+       for dir in . lib libextra; do
+               rm -f ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4
+       done
+}
+
+PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-xx"
+
+FILES_${PN}-dev += "${bindir}/gnutls-cli-debug"
 FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*"
 FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
 FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*"

diff --git a/recipes/gnutls/gnutls_2.12.24.bb b/recipes/gnutls/gnutls_2.12.24.bb
index 94d9bd2..34c3ad8 100644 (file)
--- a/recipes/gnutls/gnutls_2.12.24.bb
+++ b/recipes/gnutls/gnutls_2.12.24.bb
@@ -4,11 +4,12 @@ PR = "${INC_PR}.4"
 
 SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.12/gnutls-${PV}.tar.xz"
 
-SRC_URI += "file://gnutls-openssl.patch \
-            file://correct_rpl_gettimeofday_signature.patch \
-            file://configure-fix.patch \
-            file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \
-            ${@['', 'file://fix-gettext-version.patch'][bb.data.inherits_class('native', d) or (not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1))]} \
+SRC_URI += "file://gnutls-openssl.patch;patch=1 \
+            file://correct_rpl_gettimeofday_signature.patch;patch=1 \
+            file://configure-fix.patch;patch=1 \
+#            file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch;patch=1 \
+            file://fix-gettext-version.patch;patch=1 \
+            file://no_AM_PROG_AR.patch;patch=1 \
            "
 
 SRC_URI[md5sum] = "b09960551d963f1187bb9f87f1577bfa"