[PATCH 0/3] gnutls: cleanup + add libidn PACKAGECONFIG option

[PATCH 0/3] gnutls: cleanup + add libidn PACKAGECONFIG option

[Andre McCurdy]

Andre McCurdy (3):
  gnutls.inc: minor formatting improvements
  gnutls.inc: add gmp to DEPENDS
  gnutls.inc: allow libidn support to be controlled via PACKAGECONFIG

 meta/recipes-support/gnutls/gnutls.inc | 44 ++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 20 deletions(-)

-- 
1.9.1

[PATCH 1/3] gnutls.inc: minor formatting improvements

[Andre McCurdy]

Reordering, plus combine two LDFLAGS_append_libc-uclibc lines into one.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/recipes-support/gnutls/gnutls.inc | 41 +++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index 90597db..f2d29eb 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -1,8 +1,6 @@
 SUMMARY = "GNU Transport Layer Security Library"
 HOMEPAGE = "http://www.gnu.org/software/gnutls/"
 BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls"
-DEPENDS = "nettle libidn virtual/libiconv"
-DEPENDS_append_libc-musl = " argp-standalone "
 
 LICENSE = "GPLv3+ & LGPLv2.1+"
 LICENSE_${PN} = "LGPLv2.1+"
@@ -13,24 +11,33 @@ LICENSE_${PN}-openssl = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                     file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
+DEPENDS = "nettle libidn virtual/libiconv"
+DEPENDS_append_libc-musl = " argp-standalone"
 
-SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
+SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}"
 
 SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz"
 
 inherit autotools texinfo binconfig pkgconfig gettext lib_package
 
-EXTRA_OECONF="--disable-rpath \
-              --with-included-libtasn1 \
-              --enable-local-libopts \
-              --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
-              --disable-guile \
-              --disable-crywrap \
-              --without-p11-kit \
-              --enable-openssl-compatibility \
-              "
-LDFLAGS_append_libc-musl = " -largp "
-LDFLAGS_append_libc-uclibc = " -luargp "
+PACKAGECONFIG ??= "zlib"
+
+PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers"
+PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
+
+EXTRA_OECONF = " \
+    --disable-crywrap \
+    --disable-guile \
+    --disable-rpath \
+    --enable-local-libopts \
+    --enable-openssl-compatibility \
+    --with-included-libtasn1 \
+    --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
+    --without-p11-kit \
+"
+
+LDFLAGS_append_libc-musl = " -largp"
+LDFLAGS_append_libc-uclibc = " -luargp -pthread"
 
 do_configure_prepend() {
 	for dir in . lib; do
@@ -38,16 +45,10 @@ do_configure_prepend() {
 	done
 }
 
-PACKAGECONFIG ??= "zlib"
-PACKAGECONFIG[tpm] = "--with-tpm, --without-tpm, trousers"
-PACKAGECONFIG[zlib] = "--with-zlib, --without-zlib, zlib"
-
 PACKAGES =+ "${PN}-openssl ${PN}-xx"
 
 FILES_${PN}-dev += "${bindir}/gnutls-cli-debug"
 FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
 FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*"
 
-LDFLAGS_append_libc-uclibc += " -pthread"
-
 BBCLASSEXTEND = "native nativesdk"
-- 
1.9.1

Re: [PATCH 1/3] gnutls.inc: minor formatting improvements

[Khem Raj]

On Tue, Feb 2, 2016 at 2:12 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
> Reordering, plus combine two LDFLAGS_append_libc-uclibc lines into one.
>
> Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
> ---
>  meta/recipes-support/gnutls/gnutls.inc | 41 +++++++++++++++++-----------------
>  1 file changed, 21 insertions(+), 20 deletions(-)
>
> diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
> index 90597db..f2d29eb 100644
> --- a/meta/recipes-support/gnutls/gnutls.inc
> +++ b/meta/recipes-support/gnutls/gnutls.inc
> @@ -1,8 +1,6 @@
>  SUMMARY = "GNU Transport Layer Security Library"
>  HOMEPAGE = "http://www.gnu.org/software/gnutls/"
>  BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls"
> -DEPENDS = "nettle libidn virtual/libiconv"
> -DEPENDS_append_libc-musl = " argp-standalone "

Thinking about it a bit more, we need to define a virtual for this
e.g. virtual/argp
which plugs to argp-standalone on musl and glibc on glibc based system and musl
we need something similar for fts as well. So recipes are then
insulated and we can avoid these overrides.

>
>  LICENSE = "GPLv3+ & LGPLv2.1+"
>  LICENSE_${PN} = "LGPLv2.1+"
> @@ -13,24 +11,33 @@ LICENSE_${PN}-openssl = "GPLv3+"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
>                      file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
>
> +DEPENDS = "nettle libidn virtual/libiconv"
> +DEPENDS_append_libc-musl = " argp-standalone"
>
> -SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
> +SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}"
>
>  SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz"
>
>  inherit autotools texinfo binconfig pkgconfig gettext lib_package
>
> -EXTRA_OECONF="--disable-rpath \
> -              --with-included-libtasn1 \
> -              --enable-local-libopts \
> -              --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
> -              --disable-guile \
> -              --disable-crywrap \
> -              --without-p11-kit \
> -              --enable-openssl-compatibility \
> -              "
> -LDFLAGS_append_libc-musl = " -largp "
> -LDFLAGS_append_libc-uclibc = " -luargp "
> +PACKAGECONFIG ??= "zlib"
> +
> +PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers"
> +PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
> +
> +EXTRA_OECONF = " \
> +    --disable-crywrap \
> +    --disable-guile \
> +    --disable-rpath \
> +    --enable-local-libopts \
> +    --enable-openssl-compatibility \
> +    --with-included-libtasn1 \
> +    --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
> +    --without-p11-kit \
> +"
> +
> +LDFLAGS_append_libc-musl = " -largp"
> +LDFLAGS_append_libc-uclibc = " -luargp -pthread"
>
>  do_configure_prepend() {
>         for dir in . lib; do
> @@ -38,16 +45,10 @@ do_configure_prepend() {
>         done
>  }
>
> -PACKAGECONFIG ??= "zlib"
> -PACKAGECONFIG[tpm] = "--with-tpm, --without-tpm, trousers"
> -PACKAGECONFIG[zlib] = "--with-zlib, --without-zlib, zlib"
> -
>  PACKAGES =+ "${PN}-openssl ${PN}-xx"
>
>  FILES_${PN}-dev += "${bindir}/gnutls-cli-debug"
>  FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
>  FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*"
>
> -LDFLAGS_append_libc-uclibc += " -pthread"
> -
>  BBCLASSEXTEND = "native nativesdk"
> --
> 1.9.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

[PATCH 2/3] gnutls.inc: add gmp to DEPENDS

[Andre McCurdy]

GnuTLS depends on gmp. The dependency is usually satisfied indirectly
via nettle, but for correctness make it explicit in the gnutls recipe.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/recipes-support/gnutls/gnutls.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index f2d29eb..2c6a8da 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -11,7 +11,7 @@ LICENSE_${PN}-openssl = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                     file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
-DEPENDS = "nettle libidn virtual/libiconv"
+DEPENDS = "nettle gmp libidn virtual/libiconv"
 DEPENDS_append_libc-musl = " argp-standalone"
 
 SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}"
-- 
1.9.1

[PATCH 3/3] gnutls.inc: allow libidn support to be controlled via PACKAGECONFIG

[Andre McCurdy]

libidn (Internationalized Domain Name support library) may not be
desired in all cases, so add a PACKAGECONFIG option to control it.

Allow --enable-doc, libtasn1 internal -vs- external (still internal
by default) and p11-kit support to be controlled via PACKAGECONFIG
too.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/recipes-support/gnutls/gnutls.inc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index 2c6a8da..e7c91eb 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -11,7 +11,7 @@ LICENSE_${PN}-openssl = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                     file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
-DEPENDS = "nettle gmp libidn virtual/libiconv"
+DEPENDS = "nettle gmp virtual/libiconv"
 DEPENDS_append_libc-musl = " argp-standalone"
 
 SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}"
@@ -20,20 +20,23 @@ SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz"
 
 inherit autotools texinfo binconfig pkgconfig gettext lib_package
 
-PACKAGECONFIG ??= "zlib"
+PACKAGECONFIG ??= "libidn zlib"
 
+PACKAGECONFIG[docs] = "--enable-doc,--disable-doc"
+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 = " \
     --disable-crywrap \
+    --disable-libdane \
     --disable-guile \
     --disable-rpath \
     --enable-local-libopts \
     --enable-openssl-compatibility \
-    --with-included-libtasn1 \
     --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
-    --without-p11-kit \
 "
 
 LDFLAGS_append_libc-musl = " -largp"
-- 
1.9.1