summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2007-11-18 00:01:11 +0000
committerRichard Purdie <rpurdie@rpsys.net>2007-11-18 00:01:11 +0000
commit5df69538683899016c99bc52343036994097b734 (patch)
treed93c328f9522dae35a2470f365f4b3d0109c4d26
parentb16c10c2454356284d5b2dc1ab6ad62b4a89e86a (diff)
gnutls: Add patch to fix bogus -L and -I compiler options being used (from poky)
-rw-r--r--packages/gnutls/gnutls.inc3
-rw-r--r--packages/gnutls/gnutls/configure_madness.patch22
-rw-r--r--packages/gnutls/gnutls_1.6.3.bb2
3 files changed, 25 insertions, 2 deletions
diff --git a/packages/gnutls/gnutls.inc b/packages/gnutls/gnutls.inc
index ab5ba1d1d0..2211d5f798 100644
--- a/packages/gnutls/gnutls.inc
+++ b/packages/gnutls/gnutls.inc
@@ -6,7 +6,8 @@ LICENSE = "LGPL"
SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \
file://gnutls-openssl.patch;patch=1 \
- file://gnutls-texinfo-euro.patch;patch=1"
+ file://gnutls-texinfo-euro.patch;patch=1 \
+ file://configure_madness.patch;patch=1 "
inherit autotools binconfig pkgconfig
diff --git a/packages/gnutls/gnutls/configure_madness.patch b/packages/gnutls/gnutls/configure_madness.patch
new file mode 100644
index 0000000000..26111dfe96
--- /dev/null
+++ b/packages/gnutls/gnutls/configure_madness.patch
@@ -0,0 +1,22 @@
+Index: gnutls-1.6.3/configure.in
+===================================================================
+--- gnutls-1.6.3.orig/configure.in 2007-05-25 12:28:59.000000000 +0000
++++ gnutls-1.6.3/configure.in 2007-11-13 17:53:23.000000000 +0000
+@@ -574,13 +574,13 @@
+ AC_LIBTOOL_WIN32_DLL
+ AC_PROG_LIBTOOL
+
+-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
+-LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS -I${includedir}"
++LIBGNUTLS_LIBS="-lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
++LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS"
+ AC_SUBST(LIBGNUTLS_LIBS)
+ AC_SUBST(LIBGNUTLS_CFLAGS)
+
+-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LIBOPENCDK_LIBS $LZO_LIBS $LIBGNUTLS_LIBS"
+-LIBGNUTLS_EXTRA_CFLAGS="$LIBOPENCDK_CFLAGS -I${includedir}"
++LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LIBOPENCDK_LIBS $LZO_LIBS $LIBGNUTLS_LIBS"
++LIBGNUTLS_EXTRA_CFLAGS="$LIBOPENCDK_CFLAGS"
+ AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
+ AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
+ export ac_full
diff --git a/packages/gnutls/gnutls_1.6.3.bb b/packages/gnutls/gnutls_1.6.3.bb
index 6e0f6000d3..a5b5341156 100644
--- a/packages/gnutls/gnutls_1.6.3.bb
+++ b/packages/gnutls/gnutls_1.6.3.bb
@@ -1,2 +1,2 @@
require gnutls.inc
-PR = "r2"
+PR = "r3"