diff options
author | Richard Purdie <richard@openedhand.com> | 2008-03-19 16:27:24 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-03-19 16:27:24 +0000 |
commit | e292c5108176e971889394624999eccbe2a96439 (patch) | |
tree | bd00a5c8fdd9698b2e5bc66fa4c3e98a4e3ec43b | |
parent | 61d68105768485b6c0b88081250b9599c0975fce (diff) | |
download | openembedded-core-e292c5108176e971889394624999eccbe2a96439.tar.gz openembedded-core-e292c5108176e971889394624999eccbe2a96439.tar.bz2 openembedded-core-e292c5108176e971889394624999eccbe2a96439.tar.xz openembedded-core-e292c5108176e971889394624999eccbe2a96439.zip |
gnutls: Sync with OE for enhanced configure patch, remove unused file
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4067 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r-- | meta/packages/gnutls/gnutls-1.6.3/configure_madness.patch | 49 | ||||
-rw-r--r-- | meta/packages/gnutls/gnutls-1.6.3/gnutls-openssl.patch (renamed from meta/packages/gnutls/gnutls/gnutls-openssl.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gnutls/gnutls-1.6.3/gnutls-texinfo-euro.patch (renamed from meta/packages/gnutls/gnutls/gnutls-texinfo-euro.patch) | 0 | ||||
-rw-r--r-- | meta/packages/gnutls/gnutls.inc | 5 | ||||
-rw-r--r-- | meta/packages/gnutls/gnutls/configure_madness.patch | 22 | ||||
-rw-r--r-- | meta/packages/gnutls/gnutls/onceonly.m4 | 63 | ||||
-rw-r--r-- | meta/packages/gnutls/gnutls_1.6.3.bb | 9 |
7 files changed, 58 insertions, 90 deletions
diff --git a/meta/packages/gnutls/gnutls-1.6.3/configure_madness.patch b/meta/packages/gnutls/gnutls-1.6.3/configure_madness.patch new file mode 100644 index 000000000..bdee81cc5 --- /dev/null +++ b/meta/packages/gnutls/gnutls-1.6.3/configure_madness.patch @@ -0,0 +1,49 @@ +Index: gnutls-1.6.3/configure.in +=================================================================== +--- gnutls-1.6.3.orig/configure.in 2008-02-29 09:58:12.000000000 +0000 ++++ gnutls-1.6.3/configure.in 2008-02-29 09:58:15.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 +Index: gnutls-1.6.3/lib/gnutls.pc.in +=================================================================== +--- gnutls-1.6.3.orig/lib/gnutls.pc.in 2008-02-29 09:58:23.000000000 +0000 ++++ gnutls-1.6.3/lib/gnutls.pc.in 2008-02-29 09:58:49.000000000 +0000 +@@ -18,6 +18,7 @@ + Name: GnuTLS + Description: Transport Security Layer implementation for the GNU system + Version: @VERSION@ ++Requires.private: gcrypt + Libs: -L${libdir} -lgnutls +-Libs.private: @LIBGNUTLS_LIBS@ ++Libs.private: -L${libdir} -lgnutls + Cflags: -I${includedir} +Index: gnutls-1.6.3/libextra/gnutls-extra.pc.in +=================================================================== +--- gnutls-1.6.3.orig/libextra/gnutls-extra.pc.in 2008-02-29 09:59:02.000000000 +0000 ++++ gnutls-1.6.3/libextra/gnutls-extra.pc.in 2008-02-29 09:59:31.000000000 +0000 +@@ -18,7 +18,8 @@ + Name: GnuTLS-extra + Description: Additional add-ons for GnuTLS licensed under GPL + Requires: gnutls ++Requires.private: gnutls + Version: @VERSION@ + Libs: -L${libdir} -lgnutls-extra +-Libs.private: @LIBGNUTLS_EXTRA_LIBS@ ++Libs.private: -L${libdir} -lgnutls-extra + Cflags: -I${includedir} diff --git a/meta/packages/gnutls/gnutls/gnutls-openssl.patch b/meta/packages/gnutls/gnutls-1.6.3/gnutls-openssl.patch index e2c189592..e2c189592 100644 --- a/meta/packages/gnutls/gnutls/gnutls-openssl.patch +++ b/meta/packages/gnutls/gnutls-1.6.3/gnutls-openssl.patch diff --git a/meta/packages/gnutls/gnutls/gnutls-texinfo-euro.patch b/meta/packages/gnutls/gnutls-1.6.3/gnutls-texinfo-euro.patch index e2a276242..e2a276242 100644 --- a/meta/packages/gnutls/gnutls/gnutls-texinfo-euro.patch +++ b/meta/packages/gnutls/gnutls-1.6.3/gnutls-texinfo-euro.patch diff --git a/meta/packages/gnutls/gnutls.inc b/meta/packages/gnutls/gnutls.inc index 2211d5f79..d08b0ca93 100644 --- a/meta/packages/gnutls/gnutls.inc +++ b/meta/packages/gnutls/gnutls.inc @@ -4,10 +4,7 @@ DEPENDS = "zlib libgcrypt lzo" 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://configure_madness.patch;patch=1 " +SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2" inherit autotools binconfig pkgconfig diff --git a/meta/packages/gnutls/gnutls/configure_madness.patch b/meta/packages/gnutls/gnutls/configure_madness.patch deleted file mode 100644 index 26111dfe9..000000000 --- a/meta/packages/gnutls/gnutls/configure_madness.patch +++ /dev/null @@ -1,22 +0,0 @@ -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/onceonly.m4 b/meta/packages/gnutls/gnutls/onceonly.m4 deleted file mode 100644 index f6fec37cb..000000000 --- a/meta/packages/gnutls/gnutls/onceonly.m4 +++ /dev/null @@ -1,63 +0,0 @@ -# onceonly.m4 serial 3 -dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl This file defines some "once only" variants of standard autoconf macros. -dnl AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS -dnl AC_CHECK_FUNCS_ONCE like AC_CHECK_FUNCS -dnl AC_CHECK_DECLS_ONCE like AC_CHECK_DECLS -dnl AC_REQUIRE([AC_HEADER_STDC]) like AC_HEADER_STDC -dnl The advantage is that the check for each of the headers/functions/decls -dnl will be put only once into the 'configure' file. It keeps the size of -dnl the 'configure' file down, and avoids redundant output when 'configure' -dnl is run. -dnl The drawback is that the checks cannot be conditionalized. If you write -dnl if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi -dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to -dnl empty, and the check will be inserted before the body of the AC_DEFUNed -dnl function. - -dnl Autoconf version 2.57 or newer is recommended. -AC_PREREQ(2.54) - -# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of -# AC_CHECK_HEADERS(HEADER1 HEADER2 ...). -AC_DEFUN([AC_CHECK_HEADERS_ONCE], [ - : - AC_FOREACH([gl_HEADER_NAME], [$1], [ - AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(defn([gl_HEADER_NAME]), - [-./], [___])), [ - AC_CHECK_HEADERS(gl_HEADER_NAME) - ]) - AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME, - [-./], [___]))) - ]) -]) - -# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of -# AC_CHECK_FUNCS(FUNC1 FUNC2 ...). -AC_DEFUN([AC_CHECK_FUNCS_ONCE], [ - : - AC_FOREACH([gl_FUNC_NAME], [$1], [ - AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [ - AC_CHECK_FUNCS(defn([gl_FUNC_NAME])) - ]) - AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME])) - ]) -]) - -# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of -# AC_CHECK_DECLS(DECL1, DECL2, ...). -AC_DEFUN([AC_CHECK_DECLS_ONCE], [ - : - AC_FOREACH([gl_DECL_NAME], [$1], [ - AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [ - AC_CHECK_DECLS(defn([gl_DECL_NAME])) - ]) - AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME])) - ]) -]) diff --git a/meta/packages/gnutls/gnutls_1.6.3.bb b/meta/packages/gnutls/gnutls_1.6.3.bb index a5b534115..ce10a4b6c 100644 --- a/meta/packages/gnutls/gnutls_1.6.3.bb +++ b/meta/packages/gnutls/gnutls_1.6.3.bb @@ -1,2 +1,9 @@ require gnutls.inc -PR = "r3" + +SRC_URI += "\ + file://gnutls-openssl.patch;patch=1 \ + file://gnutls-texinfo-euro.patch;patch=1 \ + file://configure_madness.patch;patch=1 \ + " + +PR = "r6" |