From bd1e627bef29830f9346b4b984905fd8fcf2e716 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Sat, 9 Jul 2011 19:48:07 -0700 Subject: [PATCH] libiconv: add version 1.13.1 Keep older libiconv 1.11.1 as 1.13.1 is now LGPLv3 Signed-off-by: Saul Wold --- .../{libiconv-1.11.1 => files}/autoconf.patch | 2 ++ .../shared_preloadable_libiconv_linux.patch | 2 ++ .../libiconv/libiconv_1.13.1.bb | 29 +++++++++++++++++++ 3 files changed, 33 insertions(+) rename meta/recipes-support/libiconv/{libiconv-1.11.1 => files}/autoconf.patch (98%) rename meta/recipes-support/libiconv/{libiconv-1.11.1 => files}/shared_preloadable_libiconv_linux.patch (98%) create mode 100644 meta/recipes-support/libiconv/libiconv_1.13.1.bb diff --git a/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch b/meta/recipes-support/libiconv/files/autoconf.patch similarity index 98% rename from meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch rename to 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 for autoconf 2.65 to reconfigure libiconv and defines the m4 macros directory. Its imported from OE. +Upstream-Status: Pending + Signed-off-by: Khem Raj Index: 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 similarity index 98% rename from meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch rename to 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 libiconv 1.11.x is relatively old release and libtool 2.4 did not exist when it was released these kind of problem are more likely +Upstream-Status: Pending + Signed-off-by: Khem Raj Index: 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 @@ +DESCRIPTION = "GNU libiconv - libiconv is for you if your application needs to support \ +multiple character encodings, but that support lacks from your system." +HOMEPAGE = "http://www.gnu.org/software/libiconv" +SECTION = "libs" +NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8" +PROVIDES = "virtual/libiconv" +PR = "r0" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \ + file://libcharset/COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" +SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ + file://autoconf.patch \ + file://shared_preloadable_libiconv_linux.patch \ + " + +SRC_URI[md5sum] = "d42b97f6ef5dd0ba4469d520ed732fed" +SRC_URI[sha256sum] = "e78c347a1a0cb15f2648519e9799151f4b4a934b61ad9ee7424478efe2b8257f" + +S = "${WORKDIR}/libiconv-${PV}" + +inherit autotools pkgconfig gettext + +EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable" + +LEAD_SONAME = "libiconv.so" + +do_configure_prepend () { + rm -f m4/libtool.m4 libcharset/m4/libtool.m4 +} -- 2.40.1