[oe-commits] org.oe.dev gnutls: Add patch to fix bogus -L and -I compiler options being used (from poky)

[rpurdie commit]

gnutls: Add patch to fix bogus -L and -I compiler options being used (from poky)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 60125320c544cbbfbe9a6f9b2b4592956d31ca1b
ViewMTN: http://monotone.openembedded.org/revision/info/60125320c544cbbfbe9a6f9b2b4592956d31ca1b
Files:
1
packages/gnutls/gnutls/configure_madness.patch
packages/gnutls/gnutls.inc
packages/gnutls/gnutls_1.6.3.bb
Diffs:

#
# mt diff -r7da1c93d8e0d12a34bf02402dbef9cbbf84c1dd0 -r60125320c544cbbfbe9a6f9b2b4592956d31ca1b
#
# 
# 
# add_file "packages/gnutls/gnutls/configure_madness.patch"
#  content [2998e7642de3c93def273f07b105f57b61a9f9c9]
# 
# patch "packages/gnutls/gnutls.inc"
#  from [68f9beaa99eeb59c7371dd555e9485abd13efa46]
#    to [cc20d75c7e1753143d7a8fd4b2ec7fc8a708868a]
# 
# patch "packages/gnutls/gnutls_1.6.3.bb"
#  from [d18e2ac29c491d7cb869d8f693413a0ab802f11c]
#    to [dbb7cf9f7c57730e2f8cac2d3f4c14485a44bf85]
# 
============================================================
--- packages/gnutls/gnutls/configure_madness.patch	2998e7642de3c93def273f07b105f57b61a9f9c9
+++ packages/gnutls/gnutls/configure_madness.patch	2998e7642de3c93def273f07b105f57b61a9f9c9
@@ -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
============================================================
--- packages/gnutls/gnutls.inc	68f9beaa99eeb59c7371dd555e9485abd13efa46
+++ packages/gnutls/gnutls.inc	cc20d75c7e1753143d7a8fd4b2ec7fc8a708868a
@@ -6,7 +6,8 @@ SRC_URI = "ftp://ftp.gnutls.org/pub/gnut
 
 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
 
============================================================
--- packages/gnutls/gnutls_1.6.3.bb	d18e2ac29c491d7cb869d8f693413a0ab802f11c
+++ packages/gnutls/gnutls_1.6.3.bb	dbb7cf9f7c57730e2f8cac2d3f4c14485a44bf85
@@ -1,2 +1,2 @@ require gnutls.inc
 require gnutls.inc
+PR = "r3"
-PR = "r2"