diff options
author | Valentin Popa <valentin.popa@intel.com> | 2014-04-28 17:27:29 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-06 17:59:16 +0100 |
commit | 37610cc401de8ef9da7349a8915f73c5e8efd9f2 (patch) | |
tree | df8734f9a0363201bc933994c5cdc5bdfb1a0312 /meta/recipes-support/gnutls/gnutls.inc | |
parent | 220c7e091de413da8846e0b4dd8e1ccc03de77bc (diff) | |
download | poky-37610cc401de8ef9da7349a8915f73c5e8efd9f2.tar.gz |
gnutls: update to 3.2.13
Removes not needed or already merged patches.
Removes unused configure flags.
Tells gnutls to use the included libopts.
Removes libextra (not needed since 3.0.5).
(From OE-Core rev: 4e360033579b9501449798b2d118f786816a557f)
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnutls/gnutls.inc')
-rw-r--r-- | meta/recipes-support/gnutls/gnutls.inc | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index 206ba4b96e..8820b0ef39 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc | |||
@@ -1,46 +1,42 @@ | |||
1 | SUMMARY = "GNU Transport Layer Security Library" | 1 | SUMMARY = "GNU Transport Layer Security Library" |
2 | HOMEPAGE = "http://www.gnu.org/software/gnutls/" | 2 | HOMEPAGE = "http://www.gnu.org/software/gnutls/" |
3 | BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" | 3 | BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" |
4 | DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) libcap readline" | 4 | DEPENDS = "zlib nettle" |
5 | |||
6 | INC_PR = "r8" | ||
7 | 5 | ||
8 | LICENSE = "GPLv3+ & LGPLv2.1+" | 6 | LICENSE = "GPLv3+ & LGPLv2.1+" |
9 | LICENSE_${PN} = "LGPLv2.1+" | 7 | LICENSE_${PN} = "LGPLv2.1+" |
10 | LICENSE_${PN}-xx = "LGPLv2.1+" | 8 | LICENSE_${PN}-xx = "LGPLv2.1+" |
11 | LICENSE_${PN}-bin = "GPLv3+" | 9 | LICENSE_${PN}-bin = "GPLv3+" |
12 | LICENSE_${PN}-extra = "GPLv3+" | ||
13 | LICENSE_${PN}-openssl = "GPLv3+" | 10 | LICENSE_${PN}-openssl = "GPLv3+" |
11 | |||
14 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ |
15 | file://lib/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ | 13 | file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" |
16 | file://libextra/COPYING;md5=d32239bcb673463ab874e80d47fae504" | 14 | |
17 | 15 | ||
18 | SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" | 16 | SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" |
19 | 17 | ||
20 | SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.bz2" | 18 | SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz" |
21 | 19 | ||
22 | inherit autotools-brokensep texinfo binconfig pkgconfig gettext lib_package | 20 | inherit autotools-brokensep texinfo binconfig pkgconfig gettext lib_package |
23 | 21 | ||
24 | EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \ | 22 | EXTRA_OECONF="--disable-rpath \ |
25 | --with-libtasn1-prefix=${STAGING_DIR_HOST}${prefix} \ | 23 | --with-included-libtasn1 \ |
26 | --with-libgcrypt --with-libgcrypt-prefix=${STAGING_DIR_HOST}${prefix} \ | 24 | --enable-local-libopts \ |
27 | --with-libdl-prefix=${STAGING_DIR_HOST}${prefix} \ | ||
28 | --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ | 25 | --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ |
29 | --with-libreadline-prefix=${STAGING_DIR_HOST}${prefix} \ | ||
30 | --with-libz-prefix=${STAGING_DIR_HOST}${prefix} \ | 26 | --with-libz-prefix=${STAGING_DIR_HOST}${prefix} \ |
31 | --with-lzo --disable-guile \ | 27 | --disable-guile \ |
32 | --without-p11-kit \ | 28 | --without-p11-kit \ |
33 | " | 29 | " |
30 | |||
34 | do_configure_prepend() { | 31 | do_configure_prepend() { |
35 | for dir in . lib libextra; do | 32 | for dir in . lib; do |
36 | rm -f ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4 | 33 | rm -f ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4 |
37 | done | 34 | done |
38 | } | 35 | } |
39 | 36 | ||
40 | PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-xx" | 37 | PACKAGES =+ "${PN}-openssl ${PN}-xx" |
41 | 38 | ||
42 | FILES_${PN}-dev += "${bindir}/gnutls-cli-debug" | 39 | FILES_${PN}-dev += "${bindir}/gnutls-cli-debug" |
43 | FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*" | ||
44 | FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" | 40 | FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" |
45 | FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*" | 41 | FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*" |
46 | 42 | ||