summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-07-09 19:48:07 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-19 17:34:17 +0100
commit32ca3e079838e8a4575958c779f9730980dd6770 (patch)
tree63ea42834b591d97d3d34d6ba1d4a8ef02f726db
parentfa4bcfdb73167f8159b88e5a4d711c0d37627a70 (diff)
downloadpoky-32ca3e079838e8a4575958c779f9730980dd6770.tar.gz
libiconv: add version 1.13.1
Keep older libiconv 1.11.1 as 1.13.1 is now LGPLv3 (From OE-Core rev: bd1e627bef29830f9346b4b984905fd8fcf2e716) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libiconv/files/autoconf.patch (renamed from meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch)2
-rw-r--r--meta/recipes-support/libiconv/files/shared_preloadable_libiconv_linux.patch (renamed from meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch)2
-rw-r--r--meta/recipes-support/libiconv/libiconv_1.13.1.bb29
3 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch b/meta/recipes-support/libiconv/files/autoconf.patch
index 2b24894e51..3cbf549d48 100644
--- a/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
+++ b/meta/recipes-support/libiconv/files/autoconf.patch
@@ -2,6 +2,8 @@ It adds the variables that are needed
2for autoconf 2.65 to reconfigure libiconv and defines the m4 macros 2for autoconf 2.65 to reconfigure libiconv and defines the m4 macros
3directory. Its imported from OE. 3directory. Its imported from OE.
4 4
5Upstream-Status: Pending
6
5Signed-off-by: Khem Raj <raj.khem@gmail.com> 7Signed-off-by: Khem Raj <raj.khem@gmail.com>
6 8
7Index: libiconv-1.11.1/configure.ac 9Index: libiconv-1.11.1/configure.ac
diff --git a/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch b/meta/recipes-support/libiconv/files/shared_preloadable_libiconv_linux.patch
index a913dad825..fb07f7366b 100644
--- a/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
+++ b/meta/recipes-support/libiconv/files/shared_preloadable_libiconv_linux.patch
@@ -4,6 +4,8 @@ Its 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 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 5was released these kind of problem are more likely
6 6
7Upstream-Status: Pending
8
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
8 10
9Index: libiconv-1.11.1/lib/Makefile.in 11Index: libiconv-1.11.1/lib/Makefile.in
diff --git a/meta/recipes-support/libiconv/libiconv_1.13.1.bb b/meta/recipes-support/libiconv/libiconv_1.13.1.bb
new file mode 100644
index 0000000000..069881d490
--- /dev/null
+++ b/meta/recipes-support/libiconv/libiconv_1.13.1.bb
@@ -0,0 +1,29 @@
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"
5NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
6PROVIDES = "virtual/libiconv"
7PR = "r0"
8LICENSE = "LGPLv3"
9LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
10 file://libcharset/COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
11SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
12 file://autoconf.patch \
13 file://shared_preloadable_libiconv_linux.patch \
14 "
15
16SRC_URI[md5sum] = "d42b97f6ef5dd0ba4469d520ed732fed"
17SRC_URI[sha256sum] = "e78c347a1a0cb15f2648519e9799151f4b4a934b61ad9ee7424478efe2b8257f"
18
19S = "${WORKDIR}/libiconv-${PV}"
20
21inherit autotools pkgconfig gettext
22
23EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable"
24
25LEAD_SONAME = "libiconv.so"
26
27do_configure_prepend () {
28 rm -f m4/libtool.m4 libcharset/m4/libtool.m4
29}