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:06 +0100 |
| commit | 4e360033579b9501449798b2d118f786816a557f (patch) | |
| tree | c1b49530515cef6668596fa8790492af8e9b536c /meta/recipes-support/gnutls/gnutls.inc | |
| parent | e0e5eaee72e49c01e76d56cd03fbfb3e20febbb0 (diff) | |
| download | openembedded-core-contrib-4e360033579b9501449798b2d118f786816a557f.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).
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
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 @@ SUMMARY = "GNU Transport Layer Security Library" HOMEPAGE = "http://www.gnu.org/software/gnutls/" BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" -DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) libcap readline" - -INC_PR = "r8" +DEPENDS = "zlib nettle" LICENSE = "GPLv3+ & LGPLv2.1+" LICENSE_${PN} = "LGPLv2.1+" LICENSE_${PN}-xx = "LGPLv2.1+" LICENSE_${PN}-bin = "GPLv3+" -LICENSE_${PN}-extra = "GPLv3+" LICENSE_${PN}-openssl = "GPLv3+" + LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://lib/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ - file://libextra/COPYING;md5=d32239bcb673463ab874e80d47fae504" + file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" + SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" -SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.bz2" +SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz" inherit autotools-brokensep texinfo binconfig pkgconfig gettext lib_package -EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \ - --with-libtasn1-prefix=${STAGING_DIR_HOST}${prefix} \ - --with-libgcrypt --with-libgcrypt-prefix=${STAGING_DIR_HOST}${prefix} \ - --with-libdl-prefix=${STAGING_DIR_HOST}${prefix} \ +EXTRA_OECONF="--disable-rpath \ + --with-included-libtasn1 \ + --enable-local-libopts \ --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ - --with-libreadline-prefix=${STAGING_DIR_HOST}${prefix} \ --with-libz-prefix=${STAGING_DIR_HOST}${prefix} \ - --with-lzo --disable-guile \ + --disable-guile \ --without-p11-kit \ " + do_configure_prepend() { - for dir in . lib libextra; do + for dir in . lib; do rm -f ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4 done } -PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-xx" +PACKAGES =+ "${PN}-openssl ${PN}-xx" FILES_${PN}-dev += "${bindir}/gnutls-cli-debug" -FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*" FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*" |