summaryrefslogtreecommitdiffstats
path: root/meta/packages/gnutls/gnutls-2.2.3/configure_madness.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/gnutls/gnutls-2.2.3/configure_madness.patch')
-rw-r--r--meta/packages/gnutls/gnutls-2.2.3/configure_madness.patch57
1 files changed, 57 insertions, 0 deletions
diff --git a/meta/packages/gnutls/gnutls-2.2.3/configure_madness.patch b/meta/packages/gnutls/gnutls-2.2.3/configure_madness.patch
new file mode 100644
index 0000000000..475dc3f319
--- /dev/null
+++ b/meta/packages/gnutls/gnutls-2.2.3/configure_madness.patch
@@ -0,0 +1,57 @@
1---
2 configure.in | 8 ++++----
3 lib/gnutls.pc.in | 3 ++-
4 libextra/gnutls-extra.pc.in | 3 ++-
5 3 files changed, 8 insertions(+), 6 deletions(-)
6
7--- gnutls-2.2.2.orig/configure.in
8+++ gnutls-2.2.2/configure.in
9@@ -698,17 +698,17 @@ AC_MSG_RESULT([***
10 *** Detecting options for shared libraries...
11 ])
12 AC_LIBTOOL_WIN32_DLL
13 AC_PROG_LIBTOOL
14
15-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
16-LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS -I${includedir}"
17+LIBGNUTLS_LIBS="-lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
18+LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS"
19 AC_SUBST(LIBGNUTLS_LIBS)
20 AC_SUBST(LIBGNUTLS_CFLAGS)
21
22-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LTLIBOPENCDK $LZO_LIBS $LIBGNUTLS_LIBS"
23-LIBGNUTLS_EXTRA_CFLAGS="$INCOPENCDK -I${includedir}"
24+LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LTLIBOPENCDK $LZO_LIBS $LIBGNUTLS_LIBS"
25+LIBGNUTLS_EXTRA_CFLAGS="$INCOPENCDK"
26 AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
27 AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
28 export ac_full
29
30 AM_CFLAGS="${AM_CFLAGS} ${LIBGCRYPT_CFLAGS}"
31--- gnutls-2.2.2.orig/lib/gnutls.pc.in
32+++ gnutls-2.2.2/lib/gnutls.pc.in
33@@ -16,8 +16,9 @@ libdir=@libdir@
34 includedir=@includedir@
35
36 Name: GnuTLS
37 Description: Transport Security Layer implementation for the GNU system
38 Version: @VERSION@
39+Requires.private: libgcrypt
40 Libs: -L${libdir} -lgnutls
41-Libs.private: @LIBGNUTLS_LIBS@
42+Libs.private: -L${libdir} -lgnutls
43 Cflags: -I${includedir}
44--- gnutls-2.2.2.orig/libextra/gnutls-extra.pc.in
45+++ gnutls-2.2.2/libextra/gnutls-extra.pc.in
46@@ -16,9 +16,10 @@ libdir=@libdir@
47 includedir=@includedir@
48
49 Name: GnuTLS-extra
50 Description: Additional add-ons for GnuTLS licensed under GPL
51 Requires: gnutls
52+Requires.private: gnutls
53 Version: @VERSION@
54 Libs: -L${libdir} -lgnutls-extra
55-Libs.private: @LIBGNUTLS_EXTRA_LIBS@
56+Libs.private: -L${libdir} -lgnutls-extra
57 Cflags: -I${includedir}