summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-07-21 14:23:22 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-21 22:50:24 +0100
commite803c58ffb05e6d1f5938f1bfe6dfca9e3c26e02 (patch)
tree2b9781bee73b30041f8472635165df0fabde99e1 /meta
parentc97f136a944b234d3fa8b3d804f7c88863890133 (diff)
downloadpoky-e803c58ffb05e6d1f5938f1bfe6dfca9e3c26e02.tar.gz
libiconv: Fix build failure on 1.13.1
It needs a different patch for 1.13.1 for autoconf'ing Rename files to libiconv-1.11.1 and have a separate directory for libiconv-1.13.1 (From OE-Core rev: f175e4f28aa835abef8c3d5e2065054416692418) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch (renamed from meta/recipes-support/libiconv/files/autoconf.patch)0
-rw-r--r--meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch (renamed from meta/recipes-support/libiconv/files/shared_preloadable_libiconv_linux.patch)0
-rw-r--r--meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch50
-rw-r--r--meta/recipes-support/libiconv/libiconv_1.13.1.bb3
4 files changed, 51 insertions, 2 deletions
diff --git a/meta/recipes-support/libiconv/files/autoconf.patch b/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
index 3cbf549d48..3cbf549d48 100644
--- a/meta/recipes-support/libiconv/files/autoconf.patch
+++ b/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
diff --git a/meta/recipes-support/libiconv/files/shared_preloadable_libiconv_linux.patch b/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
index fb07f7366b..fb07f7366b 100644
--- a/meta/recipes-support/libiconv/files/shared_preloadable_libiconv_linux.patch
+++ b/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
diff --git a/meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch b/meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch
new file mode 100644
index 0000000000..5d34ce7c0e
--- /dev/null
+++ b/meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch
@@ -0,0 +1,50 @@
1It adds the variables that are needed
2for autoconf 2.65 to reconfigure libiconv and delete the m4 macros
3directory. Its imported from OE.
4
5Upstream-Status: Pending
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8
9Index: libiconv-1.13.1/configure.ac
10===================================================================
11--- libiconv-1.13.1.orig/configure.ac
12+++ libiconv-1.13.1/configure.ac
13@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR([build-aux])
14 AM_INIT_AUTOMAKE([libiconv], [1.13.1])
15 AC_CONFIG_HEADERS([config.h lib/config.h])
16 AC_PROG_MAKE_SET
17-
18+AC_CONFIG_MACRO_DIR([m4])
19 dnl checks for basic programs
20
21 AC_PROG_CC
22Index: libiconv-1.13.1/libcharset/configure.ac
23===================================================================
24--- libiconv-1.13.1.orig/libcharset/configure.ac
25+++ libiconv-1.13.1/libcharset/configure.ac
26@@ -16,17 +16,17 @@ dnl along with the GNU CHARSET Library;
27 dnl write to the Free Software Foundation, Inc., 51 Franklin Street,
28 dnl Fifth Floor, Boston, MA 02110-1301, USA.
29
30-AC_PREREQ([2.13])
31+AC_PREREQ(2.61)
32+AC_INIT([libcharset],[1.4] )
33+AC_CONFIG_SRCDIR([lib/localcharset.c])
34
35-PACKAGE=libcharset
36-VERSION=1.4
37-
38-AC_INIT([lib/localcharset.c])
39 AC_CONFIG_AUX_DIR([build-aux])
40 AC_CONFIG_HEADER([config.h])
41 AC_PROG_MAKE_SET
42-AC_SUBST([PACKAGE])
43-AC_SUBST([VERSION])
44+dnl AC_SUBST(PACKAGE)
45+dnl AC_SUBST(VERSION)
46+
47+AC_CONFIG_MACRO_DIR([m4])
48
49 dnl checks for basic programs
50
diff --git a/meta/recipes-support/libiconv/libiconv_1.13.1.bb b/meta/recipes-support/libiconv/libiconv_1.13.1.bb
index 026f530107..6471e32d5b 100644
--- a/meta/recipes-support/libiconv/libiconv_1.13.1.bb
+++ b/meta/recipes-support/libiconv/libiconv_1.13.1.bb
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
11 11
12SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ 12SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
13 file://autoconf.patch \ 13 file://autoconf.patch \
14 file://shared_preloadable_libiconv_linux.patch \
15 " 14 "
16 15
17SRC_URI[md5sum] = "7ab33ebd26687c744a37264a330bbe9a" 16SRC_URI[md5sum] = "7ab33ebd26687c744a37264a330bbe9a"
@@ -26,5 +25,5 @@ EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable"
26LEAD_SONAME = "libiconv.so" 25LEAD_SONAME = "libiconv.so"
27 26
28do_configure_prepend () { 27do_configure_prepend () {
29 rm -f m4/libtool.m4 libcharset/m4/libtool.m4 28 rm -f m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 libcharset/m4/libtool.m4 libcharset/m4/ltoptions.m4 libcharset/m4/ltsugar.m4 libcharset/m4/ltversion.m4 libcharset/m4/lt~obsolete.m4
30} 29}