diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2016-02-02 14:12:31 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-04 23:35:05 +0000 |
| commit | b21aeb4ac8a5a392234deaa2c0400c6f1a39b871 (patch) | |
| tree | 14b6fe79f91b36122a85c6edfb7e5749dcbdee95 /meta | |
| parent | bc02a478a5d4a5de7b3943ed809d5c22711f5b1f (diff) | |
| download | openembedded-core-b21aeb4ac8a5a392234deaa2c0400c6f1a39b871.tar.gz openembedded-core-b21aeb4ac8a5a392234deaa2c0400c6f1a39b871.tar.bz2 openembedded-core-b21aeb4ac8a5a392234deaa2c0400c6f1a39b871.zip | |
gnutls.inc: minor formatting improvements
Reordering, plus combine two LDFLAGS_append_libc-uclibc lines into one.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-support/gnutls/gnutls.inc | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index 90597db6d4..f2d29eb4f7 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" |