summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-03-27 15:44:44 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-28 10:44:37 +0100
commitdff516e0ebc43aefb64f7cea1a699dad6e4e9da3 (patch)
treeade337357efaf59a371633aec5d52036dd4b91da /meta
parent673c85a8c05afc7b74cc6a17243bf7574d0277b2 (diff)
downloadpoky-dff516e0ebc43aefb64f7cea1a699dad6e4e9da3.tar.gz
libiconv: update from 1.9.2 -> 1.11.1
1.11.1 was the last LGPLv2 release shared_preloadable_libiconv_linux.patch is needed to make libtool 2.4 happy Autoconf patch is similarly made to point m4 directory and update to newer autoconf (From OE-Core rev: aab85d9003afa544f67a9573692683f36f9e44d0) 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.patch48
-rw-r--r--meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch24
-rw-r--r--meta/recipes-support/libiconv/libiconv_1.11.1.bb30
-rw-r--r--meta/recipes-support/libiconv/libiconv_1.9.2.bb21
4 files changed, 102 insertions, 21 deletions
diff --git a/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch b/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
new file mode 100644
index 0000000000..2b24894e51
--- /dev/null
+++ b/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
@@ -0,0 +1,48 @@
1It adds the variables that are needed
2for autoconf 2.65 to reconfigure libiconv and defines the m4 macros
3directory. Its imported from OE.
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7Index: libiconv-1.11.1/configure.ac
8===================================================================
9--- libiconv-1.11.1.orig/configure.ac
10+++ libiconv-1.11.1/configure.ac
11@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR(build-aux)
12 AM_INIT_AUTOMAKE(libiconv, 1.11)
13 AC_CONFIG_HEADERS(config.h lib/config.h)
14 AC_PROG_MAKE_SET
15-
16+AC_CONFIG_MACRO_DIR([m4])
17 dnl checks for basic programs
18
19 AC_PROG_CC
20Index: libiconv-1.11.1/libcharset/configure.ac
21===================================================================
22--- libiconv-1.11.1.orig/libcharset/configure.ac
23+++ libiconv-1.11.1/libcharset/configure.ac
24@@ -16,17 +16,17 @@ dnl along with the GNU CHARSET Library;
25 dnl write to the Free Software Foundation, Inc., 51 Franklin Street,
26 dnl Fifth Floor, Boston, MA 02110-1301, USA.
27
28-AC_PREREQ(2.13)
29+AC_PREREQ(2.61)
30+AC_INIT([libcharset],[1.4] )
31+AC_CONFIG_SRCDIR([lib/localcharset.c])
32
33-PACKAGE=libcharset
34-VERSION=1.4
35-
36-AC_INIT(lib/localcharset.c)
37 AC_CONFIG_AUX_DIR(build-aux)
38 AC_CONFIG_HEADER(config.h)
39 AC_PROG_MAKE_SET
40-AC_SUBST(PACKAGE)
41-AC_SUBST(VERSION)
42+dnl AC_SUBST(PACKAGE)
43+dnl AC_SUBST(VERSION)
44+
45+AC_CONFIG_MACRO_DIR([m4])
46
47 dnl checks for basic programs
48
diff --git a/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch b/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
new file mode 100644
index 0000000000..a913dad825
--- /dev/null
+++ b/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
@@ -0,0 +1,24 @@
1With libtool generating shared and static version of libraries needs -fPIC flags
2without this it will not generate the commands to create shared linked library
3Its more enforced by libtool 2.4. I have not checked it with older libtool
4libiconv 1.11.x is relatively old release and libtool 2.4 did not exist when it
5was released these kind of problem are more likely
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8
9Index: libiconv-1.11.1/lib/Makefile.in
10===================================================================
11--- libiconv-1.11.1.orig/lib/Makefile.in
12+++ libiconv-1.11.1/lib/Makefile.in
13@@ -70,9 +70,9 @@ preloadable_libiconv.so : preloadable_li
14
15 preloadable_libiconv_linux.so : $(SOURCES)
16 if test -n "@GCC@"; then \
17- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \
18+ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -rpath $(libdir) -o libpreload_iconv.la && cp .libs/libpreload_iconv.so preloadable_libiconv_linux.so; \
19 else \
20- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \
21+ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -rpath $(libdir) -o libpreload_iconv.la && cp .libs/libpreload_iconv.so preloadable_libiconv_linux.so; \
22 fi
23
24 preloadable_libiconv_solaris.so : $(SOURCES)
diff --git a/meta/recipes-support/libiconv/libiconv_1.11.1.bb b/meta/recipes-support/libiconv/libiconv_1.11.1.bb
new file mode 100644
index 0000000000..28c70c8ae0
--- /dev/null
+++ b/meta/recipes-support/libiconv/libiconv_1.11.1.bb
@@ -0,0 +1,30 @@
1DESCRIPTION = "GNU libiconv - libiconv is for you if your application needs to support \
2multiple character encodings, but that support lacks from your system."
3HOMEPAGE = "http://www.gnu.org/software/libiconv"
4SECTION = "libs"
5PRIORITY = "optional"
6NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
7PROVIDES = "virtual/libiconv"
8PR = "r0"
9LICENSE = "LGPL"
10LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
11 file://libcharset/COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
12SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
13 file://autoconf.patch \
14 file://shared_preloadable_libiconv_linux.patch \
15 "
16
17SRC_URI[md5sum] = "d42b97f6ef5dd0ba4469d520ed732fed"
18SRC_URI[sha256sum] = "e78c347a1a0cb15f2648519e9799151f4b4a934b61ad9ee7424478efe2b8257f"
19
20S = "${WORKDIR}/libiconv-${PV}"
21
22inherit autotools pkgconfig gettext
23
24EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable"
25
26LEAD_SONAME = "libiconv.so"
27
28do_configure_prepend () {
29 rm -f m4/libtool.m4 libcharset/m4/libtool.m4
30}
diff --git a/meta/recipes-support/libiconv/libiconv_1.9.2.bb b/meta/recipes-support/libiconv/libiconv_1.9.2.bb
deleted file mode 100644
index dac9e3cf0c..0000000000
--- a/meta/recipes-support/libiconv/libiconv_1.9.2.bb
+++ /dev/null
@@ -1,21 +0,0 @@
1DESCRIPTION = "GNU libiconv - libiconv is for you if your application needs to support \
2multiple character encodings, but that support lacks from your system."
3HOMEPAGE = "http://www.gnu.org/software/libiconv"
4SECTION = "libs"
5PRIORITY = "optional"
6NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
7PROVIDES = "virtual/libiconv"
8PR = "r4"
9LICENSE = "LGPL"
10SRC_URI = "${GNU_MIRROR}/libiconv/libiconv-${PV}.tar.gz"
11
12S = "${WORKDIR}/libiconv-${PV}"
13
14inherit autotools pkgconfig
15
16EXTRA_OECONF += "--enable-shared --enable-static"
17
18do_configure () {
19 rm -f m4/libtool.m4 libcharset/m4/libtool.m4
20 autotools_do_configure
21}