summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnutls
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-02-02 14:12:31 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-04 23:39:02 +0000
commit935aa967c1d0a7bdadc732519612c80b75f6feaa (patch)
treeaf37bc13cb8a966229b25aa8ba2ff3bd143a95b0 /meta/recipes-support/gnutls
parent3fa1c54a698719d51b0610e97557b10c3b8630db (diff)
downloadpoky-935aa967c1d0a7bdadc732519612c80b75f6feaa.tar.gz
gnutls.inc: minor formatting improvements
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>
Diffstat (limited to 'meta/recipes-support/gnutls')
-rw-r--r--meta/recipes-support/gnutls/gnutls.inc41
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 @@
1SUMMARY = "GNU Transport Layer Security Library" 1SUMMARY = "GNU Transport Layer Security Library"
2HOMEPAGE = "http://www.gnu.org/software/gnutls/" 2HOMEPAGE = "http://www.gnu.org/software/gnutls/"
3BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" 3BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls"
4DEPENDS = "nettle libidn virtual/libiconv"
5DEPENDS_append_libc-musl = " argp-standalone "
6 4
7LICENSE = "GPLv3+ & LGPLv2.1+" 5LICENSE = "GPLv3+ & LGPLv2.1+"
8LICENSE_${PN} = "LGPLv2.1+" 6LICENSE_${PN} = "LGPLv2.1+"
@@ -13,24 +11,33 @@ LICENSE_${PN}-openssl = "GPLv3+"
13LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 11LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
14 file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" 12 file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
15 13
14DEPENDS = "nettle libidn virtual/libiconv"
15DEPENDS_append_libc-musl = " argp-standalone"
16 16
17SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" 17SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}"
18 18
19SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz" 19SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz"
20 20
21inherit autotools texinfo binconfig pkgconfig gettext lib_package 21inherit autotools texinfo binconfig pkgconfig gettext lib_package
22 22
23EXTRA_OECONF="--disable-rpath \ 23PACKAGECONFIG ??= "zlib"
24 --with-included-libtasn1 \ 24
25 --enable-local-libopts \ 25PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers"
26 --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ 26PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
27 --disable-guile \ 27
28 --disable-crywrap \ 28EXTRA_OECONF = " \
29 --without-p11-kit \ 29 --disable-crywrap \
30 --enable-openssl-compatibility \ 30 --disable-guile \
31 " 31 --disable-rpath \
32LDFLAGS_append_libc-musl = " -largp " 32 --enable-local-libopts \
33LDFLAGS_append_libc-uclibc = " -luargp " 33 --enable-openssl-compatibility \
34 --with-included-libtasn1 \
35 --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
36 --without-p11-kit \
37"
38
39LDFLAGS_append_libc-musl = " -largp"
40LDFLAGS_append_libc-uclibc = " -luargp -pthread"
34 41
35do_configure_prepend() { 42do_configure_prepend() {
36 for dir in . lib; do 43 for dir in . lib; do
@@ -38,16 +45,10 @@ do_configure_prepend() {
38 done 45 done
39} 46}
40 47
41PACKAGECONFIG ??= "zlib"
42PACKAGECONFIG[tpm] = "--with-tpm, --without-tpm, trousers"
43PACKAGECONFIG[zlib] = "--with-zlib, --without-zlib, zlib"
44
45PACKAGES =+ "${PN}-openssl ${PN}-xx" 48PACKAGES =+ "${PN}-openssl ${PN}-xx"
46 49
47FILES_${PN}-dev += "${bindir}/gnutls-cli-debug" 50FILES_${PN}-dev += "${bindir}/gnutls-cli-debug"
48FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" 51FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
49FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*" 52FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*"
50 53
51LDFLAGS_append_libc-uclibc += " -pthread"
52
53BBCLASSEXTEND = "native nativesdk" 54BBCLASSEXTEND = "native nativesdk"