summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-03-19 16:27:24 +0000
committerRichard Purdie <richard@openedhand.com>2008-03-19 16:27:24 +0000
commite292c5108176e971889394624999eccbe2a96439 (patch)
treebd00a5c8fdd9698b2e5bc66fa4c3e98a4e3ec43b
parent61d68105768485b6c0b88081250b9599c0975fce (diff)
downloadpoky-e292c5108176e971889394624999eccbe2a96439.tar.gz
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.patch49
-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.inc5
-rw-r--r--meta/packages/gnutls/gnutls/configure_madness.patch22
-rw-r--r--meta/packages/gnutls/gnutls/onceonly.m463
-rw-r--r--meta/packages/gnutls/gnutls_1.6.3.bb9
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 0000000000..bdee81cc54
--- /dev/null
+++ b/meta/packages/gnutls/gnutls-1.6.3/configure_madness.patch
@@ -0,0 +1,49 @@
1Index: gnutls-1.6.3/configure.in
2===================================================================
3--- gnutls-1.6.3.orig/configure.in 2008-02-29 09:58:12.000000000 +0000
4+++ gnutls-1.6.3/configure.in 2008-02-29 09:58:15.000000000 +0000
5@@ -574,13 +574,13 @@
6 AC_LIBTOOL_WIN32_DLL
7 AC_PROG_LIBTOOL
8
9-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
10-LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS -I${includedir}"
11+LIBGNUTLS_LIBS="-lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
12+LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS"
13 AC_SUBST(LIBGNUTLS_LIBS)
14 AC_SUBST(LIBGNUTLS_CFLAGS)
15
16-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LIBOPENCDK_LIBS $LZO_LIBS $LIBGNUTLS_LIBS"
17-LIBGNUTLS_EXTRA_CFLAGS="$LIBOPENCDK_CFLAGS -I${includedir}"
18+LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LIBOPENCDK_LIBS $LZO_LIBS $LIBGNUTLS_LIBS"
19+LIBGNUTLS_EXTRA_CFLAGS="$LIBOPENCDK_CFLAGS"
20 AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
21 AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
22 export ac_full
23Index: gnutls-1.6.3/lib/gnutls.pc.in
24===================================================================
25--- gnutls-1.6.3.orig/lib/gnutls.pc.in 2008-02-29 09:58:23.000000000 +0000
26+++ gnutls-1.6.3/lib/gnutls.pc.in 2008-02-29 09:58:49.000000000 +0000
27@@ -18,6 +18,7 @@
28 Name: GnuTLS
29 Description: Transport Security Layer implementation for the GNU system
30 Version: @VERSION@
31+Requires.private: gcrypt
32 Libs: -L${libdir} -lgnutls
33-Libs.private: @LIBGNUTLS_LIBS@
34+Libs.private: -L${libdir} -lgnutls
35 Cflags: -I${includedir}
36Index: gnutls-1.6.3/libextra/gnutls-extra.pc.in
37===================================================================
38--- gnutls-1.6.3.orig/libextra/gnutls-extra.pc.in 2008-02-29 09:59:02.000000000 +0000
39+++ gnutls-1.6.3/libextra/gnutls-extra.pc.in 2008-02-29 09:59:31.000000000 +0000
40@@ -18,7 +18,8 @@
41 Name: GnuTLS-extra
42 Description: Additional add-ons for GnuTLS licensed under GPL
43 Requires: gnutls
44+Requires.private: gnutls
45 Version: @VERSION@
46 Libs: -L${libdir} -lgnutls-extra
47-Libs.private: @LIBGNUTLS_EXTRA_LIBS@
48+Libs.private: -L${libdir} -lgnutls-extra
49 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 e2c189592f..e2c189592f 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 e2a2762424..e2a2762424 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 2211d5f798..d08b0ca931 100644
--- a/meta/packages/gnutls/gnutls.inc
+++ b/meta/packages/gnutls/gnutls.inc
@@ -4,10 +4,7 @@ DEPENDS = "zlib libgcrypt lzo"
4 4
5LICENSE = "LGPL" 5LICENSE = "LGPL"
6 6
7SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \ 7SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2"
8 file://gnutls-openssl.patch;patch=1 \
9 file://gnutls-texinfo-euro.patch;patch=1 \
10 file://configure_madness.patch;patch=1 "
11 8
12inherit autotools binconfig pkgconfig 9inherit autotools binconfig pkgconfig
13 10
diff --git a/meta/packages/gnutls/gnutls/configure_madness.patch b/meta/packages/gnutls/gnutls/configure_madness.patch
deleted file mode 100644
index 26111dfe96..0000000000
--- a/meta/packages/gnutls/gnutls/configure_madness.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Index: gnutls-1.6.3/configure.in
2===================================================================
3--- gnutls-1.6.3.orig/configure.in 2007-05-25 12:28:59.000000000 +0000
4+++ gnutls-1.6.3/configure.in 2007-11-13 17:53:23.000000000 +0000
5@@ -574,13 +574,13 @@
6 AC_LIBTOOL_WIN32_DLL
7 AC_PROG_LIBTOOL
8
9-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
10-LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS -I${includedir}"
11+LIBGNUTLS_LIBS="-lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
12+LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS"
13 AC_SUBST(LIBGNUTLS_LIBS)
14 AC_SUBST(LIBGNUTLS_CFLAGS)
15
16-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LIBOPENCDK_LIBS $LZO_LIBS $LIBGNUTLS_LIBS"
17-LIBGNUTLS_EXTRA_CFLAGS="$LIBOPENCDK_CFLAGS -I${includedir}"
18+LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LIBOPENCDK_LIBS $LZO_LIBS $LIBGNUTLS_LIBS"
19+LIBGNUTLS_EXTRA_CFLAGS="$LIBOPENCDK_CFLAGS"
20 AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
21 AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
22 export ac_full
diff --git a/meta/packages/gnutls/gnutls/onceonly.m4 b/meta/packages/gnutls/gnutls/onceonly.m4
deleted file mode 100644
index f6fec37cbf..0000000000
--- a/meta/packages/gnutls/gnutls/onceonly.m4
+++ /dev/null
@@ -1,63 +0,0 @@
1# onceonly.m4 serial 3
2dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
3dnl This file is free software, distributed under the terms of the GNU
4dnl General Public License. As a special exception to the GNU General
5dnl Public License, this file may be distributed as part of a program
6dnl that contains a configuration script generated by Autoconf, under
7dnl the same distribution terms as the rest of that program.
8
9dnl This file defines some "once only" variants of standard autoconf macros.
10dnl AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS
11dnl AC_CHECK_FUNCS_ONCE like AC_CHECK_FUNCS
12dnl AC_CHECK_DECLS_ONCE like AC_CHECK_DECLS
13dnl AC_REQUIRE([AC_HEADER_STDC]) like AC_HEADER_STDC
14dnl The advantage is that the check for each of the headers/functions/decls
15dnl will be put only once into the 'configure' file. It keeps the size of
16dnl the 'configure' file down, and avoids redundant output when 'configure'
17dnl is run.
18dnl The drawback is that the checks cannot be conditionalized. If you write
19dnl if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
20dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
21dnl empty, and the check will be inserted before the body of the AC_DEFUNed
22dnl function.
23
24dnl Autoconf version 2.57 or newer is recommended.
25AC_PREREQ(2.54)
26
27# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
28# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
29AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
30 :
31 AC_FOREACH([gl_HEADER_NAME], [$1], [
32 AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(defn([gl_HEADER_NAME]),
33 [-./], [___])), [
34 AC_CHECK_HEADERS(gl_HEADER_NAME)
35 ])
36 AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
37 [-./], [___])))
38 ])
39])
40
41# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
42# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
43AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
44 :
45 AC_FOREACH([gl_FUNC_NAME], [$1], [
46 AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [
47 AC_CHECK_FUNCS(defn([gl_FUNC_NAME]))
48 ])
49 AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]))
50 ])
51])
52
53# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
54# AC_CHECK_DECLS(DECL1, DECL2, ...).
55AC_DEFUN([AC_CHECK_DECLS_ONCE], [
56 :
57 AC_FOREACH([gl_DECL_NAME], [$1], [
58 AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [
59 AC_CHECK_DECLS(defn([gl_DECL_NAME]))
60 ])
61 AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME]))
62 ])
63])
diff --git a/meta/packages/gnutls/gnutls_1.6.3.bb b/meta/packages/gnutls/gnutls_1.6.3.bb
index a5b5341156..ce10a4b6cf 100644
--- a/meta/packages/gnutls/gnutls_1.6.3.bb
+++ b/meta/packages/gnutls/gnutls_1.6.3.bb
@@ -1,2 +1,9 @@
1require gnutls.inc 1require gnutls.inc
2PR = "r3" 2
3SRC_URI += "\
4 file://gnutls-openssl.patch;patch=1 \
5 file://gnutls-texinfo-euro.patch;patch=1 \
6 file://configure_madness.patch;patch=1 \
7 "
8
9PR = "r6"