From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Fri, 24 Oct 2008 10:44:44 +0000 (+0200)
Subject: gnutls: fixing the pkgconfig is not necessary for gnutls 2.4.2
X-Git-Tag: Release-2010-05/1~5695^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d4559f79c13a864d782c5599a7803389d1dd20c;p=openembedded.git

gnutls: fixing the pkgconfig is not necessary for gnutls 2.4.2
---

diff --git a/packages/gnutls/gnutls.inc b/packages/gnutls/gnutls.inc
index 6400e80b11..e438423c9c 100644
--- a/packages/gnutls/gnutls.inc
+++ b/packages/gnutls/gnutls.inc
@@ -9,11 +9,6 @@ inherit autotools binconfig pkgconfig
 
 EXTRA_OECONF = "--with-included-opencdk --with-included-libtasn1"
 
-# fix wrong dependency
-do_configure_prepend() {
-    sed -i s,gcrypt,libgcrypt, lib/gnutls.pc.in
-}
-
 do_stage() {
     oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR}
     oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR}
diff --git a/packages/gnutls/gnutls_1.4.5.bb b/packages/gnutls/gnutls_1.4.5.bb
index 749064af65..a5e58735a0 100644
--- a/packages/gnutls/gnutls_1.4.5.bb
+++ b/packages/gnutls/gnutls_1.4.5.bb
@@ -1,3 +1,8 @@
 require gnutls.inc
 
+# fix wrong dependency
+do_configure_prepend() {
+    sed -i s,gcrypt,libgcrypt, lib/gnutls.pc.in
+}
+
 PR = "r3"
diff --git a/packages/gnutls/gnutls_1.6.3.bb b/packages/gnutls/gnutls_1.6.3.bb
index ce10a4b6cf..7a89835237 100644
--- a/packages/gnutls/gnutls_1.6.3.bb
+++ b/packages/gnutls/gnutls_1.6.3.bb
@@ -6,4 +6,9 @@ SRC_URI += "\
 	file://configure_madness.patch;patch=1 \
 	"
 
+# fix wrong dependency
+do_configure_prepend() {
+    sed -i s,gcrypt,libgcrypt, lib/gnutls.pc.in
+}
+
 PR = "r6"
diff --git a/packages/gnutls/gnutls_2.4.2.bb b/packages/gnutls/gnutls_2.4.2.bb
index 3313a456a1..15614fbe5a 100644
--- a/packages/gnutls/gnutls_2.4.2.bb
+++ b/packages/gnutls/gnutls_2.4.2.bb
@@ -5,3 +5,5 @@ SRC_URI += "\
 	file://gnutls-texinfo-euro.patch;patch=1 \
 	file://configure_madness.patch;patch=1 \
 	"
+
+PR = "r1"