summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-08-20 12:19:59 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-08-20 12:19:59 +0000
commit43fb739f1451dc518fc1cdac1858371c04312097 (patch)
treec7d58ea54e1b7b8975be127f02a60b9b8e3dabe3
parent8ee1c79284959a44faa0e745e11666700fc12601 (diff)
downloadpoky-43fb739f1451dc518fc1cdac1858371c04312097.tar.gz
gnutls: remove hacks needed for autoconf 2.59
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2521 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/gnutls/gnutls.inc5
-rw-r--r--meta/packages/gnutls/gnutls_1.6.3.bb6
2 files changed, 1 insertions, 10 deletions
diff --git a/meta/packages/gnutls/gnutls.inc b/meta/packages/gnutls/gnutls.inc
index ed96e3f588..ab5ba1d1d0 100644
--- a/meta/packages/gnutls/gnutls.inc
+++ b/meta/packages/gnutls/gnutls.inc
@@ -6,17 +6,12 @@ LICENSE = "LGPL"
6 6
7SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \ 7SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \
8 file://gnutls-openssl.patch;patch=1 \ 8 file://gnutls-openssl.patch;patch=1 \
9 file://onceonly.m4 \
10 file://gnutls-texinfo-euro.patch;patch=1" 9 file://gnutls-texinfo-euro.patch;patch=1"
11 10
12inherit autotools binconfig pkgconfig 11inherit autotools binconfig pkgconfig
13 12
14EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1" 13EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1"
15 14
16do_configure_prepend() {
17 cp ${WORKDIR}/onceonly.m4 ${S}/m4/
18}
19
20do_stage() { 15do_stage() {
21 oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR} 16 oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR}
22 oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR} 17 oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR}
diff --git a/meta/packages/gnutls/gnutls_1.6.3.bb b/meta/packages/gnutls/gnutls_1.6.3.bb
index 68077c0c5a..6e0f6000d3 100644
--- a/meta/packages/gnutls/gnutls_1.6.3.bb
+++ b/meta/packages/gnutls/gnutls_1.6.3.bb
@@ -1,6 +1,2 @@
1require gnutls.inc 1require gnutls.inc
2PR = "r1" 2PR = "r2"
3
4do_configure_prepend() {
5 sed -i "s/2.60/2.59/" ${S}/configure.in
6}