diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2008-03-09 19:02:28 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2008-03-09 19:02:28 +0000 |
| commit | e7a395a40026bc2409cac42cf669a8f6f0c51e51 (patch) | |
| tree | 42823eb472b9386efdef2a7830018adb8b192913 /packages | |
| parent | da52b3030fdab75fa015b9a4c7548ce391b54b35 (diff) | |
| parent | 4184f49bebf401c7f61aa045b0265c509b64df15 (diff) | |
merge of 'a3db419309941fac383949b8b58b338cc5742f39'
and 'a7d0911cc51bd1eb437c71feab04198858ad16b8'
Diffstat (limited to 'packages')
| -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" |