diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-03-08 20:05:22 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-03-08 20:05:22 +0000 |
| commit | 2e100a4a97a75b7ea8c6d730d6c1091a27df9418 (patch) | |
| tree | 5b50ac0964a763193244d4502a2409c9f65b608a | |
| parent | 64f8b0c4860530db75a84b745e7ea2b9d5f42341 (diff) | |
| parent | 4184f49bebf401c7f61aa045b0265c509b64df15 (diff) | |
merge of '0fb63a3a1c21083e64e1fc35d8abe83eabdecfe6'
and 'a7d0911cc51bd1eb437c71feab04198858ad16b8'
| -rw-r--r-- | packages/gnutls/gnutls.inc | 4 | ||||
| -rw-r--r-- | packages/gnutls/gnutls_1.4.5.bb | 2 | ||||
| -rw-r--r-- | packages/gnutls/gnutls_1.6.3.bb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/packages/gnutls/gnutls.inc b/packages/gnutls/gnutls.inc index 781267093c..6400e80b11 100644 --- a/packages/gnutls/gnutls.inc +++ b/packages/gnutls/gnutls.inc @@ -7,10 +7,10 @@ SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2" inherit autotools binconfig pkgconfig -EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1" +EXTRA_OECONF = "--with-included-opencdk --with-included-libtasn1" # fix wrong dependency -do_configure_append() { +do_configure_prepend() { sed -i s,gcrypt,libgcrypt, lib/gnutls.pc.in } diff --git a/packages/gnutls/gnutls_1.4.5.bb b/packages/gnutls/gnutls_1.4.5.bb index 4c247717ae..749064af65 100644 --- a/packages/gnutls/gnutls_1.4.5.bb +++ b/packages/gnutls/gnutls_1.4.5.bb @@ -1,3 +1,3 @@ require gnutls.inc -PR = "r2" +PR = "r3" diff --git a/packages/gnutls/gnutls_1.6.3.bb b/packages/gnutls/gnutls_1.6.3.bb index cc35d8b7a3..ce10a4b6cf 100644 --- a/packages/gnutls/gnutls_1.6.3.bb +++ b/packages/gnutls/gnutls_1.6.3.bb @@ -6,4 +6,4 @@ SRC_URI += "\ file://configure_madness.patch;patch=1 \ " -PR = "r5" +PR = "r6" |