gnutls: cleanup + add libidn PACKAGECONFIG option
cover gnutls: cleanup + add libidn PACKAGECONFIG option
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(-)
Signature · 1 line
1.9.1
PATCH 1/3 gnutls.inc: minor formatting improvements
Reordering, plus combine two LDFLAGS_append_libc-uclibc lines into one.
Signed-off-by Andre McCurdy <[email protected]>
--- meta/recipes-support/gnutls/gnutls.inc | 41 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 20 deletions(-)
meta/recipes-support/gnutls/gnutls.inc +21 -20
@@ -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"
Signature · 1 line
1.9.1
Re: [PATCH 1/3] gnutls.inc: minor formatting improvements
Quoted 12 lines · Andre McCurdy
Reordering, plus combine two LDFLAGS_append_libc-uclibc lines into one.
Signed-off-by Andre McCurdy <[email protected]>--- meta/recipes-support/gnutls/gnutls.inc | 41 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 20 deletions(-)meta/recipes-support/gnutls/gnutls.inc +0
-0
meta/recipes-support/gnutls/gnutls.inc line 5
Quoted 5 lines
meta/recipes-support/gnutls/gnutls.inc +0
-2@@ -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.
Quoted 74 lines
meta/recipes-support/gnutls/gnutls.inc +21
-19LICENSE = "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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
PATCH 2/3 gnutls.inc: add gmp to DEPENDS
In reply to Andre McCurdyGnuTLS 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 <[email protected]>
--- meta/recipes-support/gnutls/gnutls.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/gnutls/gnutls.inc +1 -1
@@ -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]}"
Signature · 1 line
1.9.1
PATCH 3/3 gnutls.inc: allow libidn support to be controlled via PACKAGECONFIG
In reply to Andre McCurdylibidn (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 <[email protected]>
--- meta/recipes-support/gnutls/gnutls.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
meta/recipes-support/gnutls/gnutls.inc +7 -4
@@ -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"
Signature · 1 line
1.9.1