mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-26 18:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

gnutls.inc: minor formatting improvements

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

(From OE-Core rev: b21aeb4ac8a5a392234deaa2c0400c6f1a39b871)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andre McCurdy
2016-02-02 14:12:31 -08:00
committed by Richard Purdie
parent 3fa1c54a69
commit 935aa967c1
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
meta/recipes-support/gnutls/gnutls.inc
View File

@@ -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"