summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-13 19:56:58 +0000
committerRichard Purdie <richard@openedhand.com>2007-11-13 19:56:58 +0000
commit210caef864c14cf30c224f2ae09253bdf6932d7e (patch)
treec06e7ab0da63eed24495229b75bf7b6395c190b7
parent18f2e2772aa8a741317639bcd82be013277922bb (diff)
downloadopenembedded-core-210caef864c14cf30c224f2ae09253bdf6932d7e.tar.gz
openembedded-core-210caef864c14cf30c224f2ae09253bdf6932d7e.tar.bz2
openembedded-core-210caef864c14cf30c224f2ae09253bdf6932d7e.tar.xz
openembedded-core-210caef864c14cf30c224f2ae09253bdf6932d7e.zip
gnutls: Remove some bad flags from configure.ac
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3142 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/gnutls/gnutls.inc3
-rw-r--r--meta/packages/gnutls/gnutls/configure_madness.patch22
-rw-r--r--meta/packages/gnutls/gnutls_1.6.3.bb2
3 files changed, 25 insertions, 2 deletions
diff --git a/meta/packages/gnutls/gnutls.inc b/meta/packages/gnutls/gnutls.inc
index ab5ba1d1d..2211d5f79 100644
--- a/meta/packages/gnutls/gnutls.inc
+++ b/meta/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/meta/packages/gnutls/gnutls/configure_madness.patch b/meta/packages/gnutls/gnutls/configure_madness.patch
new file mode 100644
index 000000000..26111dfe9
--- /dev/null
+++ b/meta/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/meta/packages/gnutls/gnutls_1.6.3.bb b/meta/packages/gnutls/gnutls_1.6.3.bb
index 6e0f6000d..a5b534115 100644
--- a/meta/packages/gnutls/gnutls_1.6.3.bb
+++ b/meta/packages/gnutls/gnutls_1.6.3.bb
@@ -1,2 +1,2 @@
require gnutls.inc
-PR = "r2"
+PR = "r3"