diff options
Diffstat (limited to 'meta/packages/gnutls/gnutls-2.8.6/configure-fix.patch')
| -rw-r--r-- | meta/packages/gnutls/gnutls-2.8.6/configure-fix.patch | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/meta/packages/gnutls/gnutls-2.8.6/configure-fix.patch b/meta/packages/gnutls/gnutls-2.8.6/configure-fix.patch deleted file mode 100644 index 247e324564..0000000000 --- a/meta/packages/gnutls/gnutls-2.8.6/configure-fix.patch +++ /dev/null | |||
| @@ -1,64 +0,0 @@ | |||
| 1 | rebased from original configure_madness.patch | ||
| 2 | |||
| 3 | libtasn1 provides an .pc file in upstream, | ||
| 4 | and a libgcrypt.pc is added in libgcrypt recipe, | ||
| 5 | so use Requires.private for these two. | ||
| 6 | |||
| 7 | against 2.8.6 | ||
| 8 | |||
| 9 | 07/02/2010 - qhe | ||
| 10 | |||
| 11 | --- | ||
| 12 | diff --git a/lib/configure.ac b/lib/configure.ac | ||
| 13 | index 80d3375..1a486f7 100644 | ||
| 14 | --- a/lib/configure.ac | ||
| 15 | +++ b/lib/configure.ac | ||
| 16 | @@ -81,8 +81,8 @@ fi | ||
| 17 | |||
| 18 | lgl_INIT | ||
| 19 | |||
| 20 | -LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS" | ||
| 21 | -LIBGNUTLS_CFLAGS="-I${includedir}" | ||
| 22 | +LIBGNUTLS_LIBS="-lgnutls $LIBS" | ||
| 23 | +LIBGNUTLS_CFLAGS="" | ||
| 24 | AC_SUBST(LIBGNUTLS_LIBS) | ||
| 25 | AC_SUBST(LIBGNUTLS_CFLAGS) | ||
| 26 | |||
| 27 | diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in | ||
| 28 | index 3b01c17..de31469 100644 | ||
| 29 | --- a/lib/gnutls.pc.in | ||
| 30 | +++ b/lib/gnutls.pc.in | ||
| 31 | @@ -20,6 +20,6 @@ Name: GnuTLS | ||
| 32 | Description: Transport Security Layer implementation for the GNU system | ||
| 33 | URL: http://www.gnu.org/software/gnutls/ | ||
| 34 | Version: @VERSION@ | ||
| 35 | +Requires.private: libgcrypt, libtasn1 | ||
| 36 | Libs: -L${libdir} -lgnutls | ||
| 37 | -Libs.private: @LIBGNUTLS_LIBS@ @LTLIBTASN1@ | ||
| 38 | Cflags: -I${includedir} | ||
| 39 | diff --git a/libextra/configure.ac b/libextra/configure.ac | ||
| 40 | index c08e73f..3313886 100644 | ||
| 41 | --- a/libextra/configure.ac | ||
| 42 | +++ b/libextra/configure.ac | ||
| 43 | @@ -40,8 +40,8 @@ LIBGNUTLS_EXTRA_HOOKS | ||
| 44 | |||
| 45 | xgl_INIT | ||
| 46 | |||
| 47 | -LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS" | ||
| 48 | -LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}" | ||
| 49 | +LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS" | ||
| 50 | +LIBGNUTLS_EXTRA_CFLAGS="" | ||
| 51 | AC_SUBST(LIBGNUTLS_EXTRA_LIBS) | ||
| 52 | AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS) | ||
| 53 | |||
| 54 | diff --git a/libextra/gnutls-extra.pc.in b/libextra/gnutls-extra.pc.in | ||
| 55 | index 9e7b8f6..e228ec9 100644 | ||
| 56 | --- a/libextra/gnutls-extra.pc.in | ||
| 57 | +++ b/libextra/gnutls-extra.pc.in | ||
| 58 | @@ -21,5 +21,5 @@ URL: http://www.gnu.org/software/gnutls/ | ||
| 59 | Requires: gnutls | ||
| 60 | Version: @VERSION@ | ||
| 61 | Libs: -L${libdir} -lgnutls-extra | ||
| 62 | -Libs.private: @LIBGNUTLS_EXTRA_LIBS@ | ||
| 63 | +Libs.private: -llzo2 | ||
| 64 | Cflags: -I${includedir} | ||
