From abd108a45fdee66024294549356676590bcf2c92 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 29 Nov 2011 11:47:16 -0800 Subject: libiconv: Update to 1.14 (From OE-Core rev: 624d90a2d8f8f96ef2d88910f3d49530fd4c9e17) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../libiconv/libiconv-1.13.1/autoconf.patch | 50 ---------------------- .../libiconv/libiconv-1.14/autoconf.patch | 50 ++++++++++++++++++++++ meta/recipes-support/libiconv/libiconv_1.13.1.bb | 29 ------------- meta/recipes-support/libiconv/libiconv_1.14.bb | 29 +++++++++++++ 4 files changed, 79 insertions(+), 79 deletions(-) delete mode 100644 meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch create mode 100644 meta/recipes-support/libiconv/libiconv-1.14/autoconf.patch delete mode 100644 meta/recipes-support/libiconv/libiconv_1.13.1.bb create mode 100644 meta/recipes-support/libiconv/libiconv_1.14.bb (limited to 'meta/recipes-support/libiconv') diff --git a/meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch b/meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch deleted file mode 100644 index 5d34ce7c0e..0000000000 --- a/meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch +++ /dev/null @@ -1,50 +0,0 @@ -It adds the variables that are needed -for autoconf 2.65 to reconfigure libiconv and delete the m4 macros -directory. Its imported from OE. - -Upstream-Status: Pending - -Signed-off-by: Khem Raj - -Index: libiconv-1.13.1/configure.ac -=================================================================== ---- libiconv-1.13.1.orig/configure.ac -+++ libiconv-1.13.1/configure.ac -@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR([build-aux]) - AM_INIT_AUTOMAKE([libiconv], [1.13.1]) - AC_CONFIG_HEADERS([config.h lib/config.h]) - AC_PROG_MAKE_SET -- -+AC_CONFIG_MACRO_DIR([m4]) - dnl checks for basic programs - - AC_PROG_CC -Index: libiconv-1.13.1/libcharset/configure.ac -=================================================================== ---- libiconv-1.13.1.orig/libcharset/configure.ac -+++ libiconv-1.13.1/libcharset/configure.ac -@@ -16,17 +16,17 @@ dnl along with the GNU CHARSET Library; - dnl write to the Free Software Foundation, Inc., 51 Franklin Street, - dnl Fifth Floor, Boston, MA 02110-1301, USA. - --AC_PREREQ([2.13]) -+AC_PREREQ(2.61) -+AC_INIT([libcharset],[1.4] ) -+AC_CONFIG_SRCDIR([lib/localcharset.c]) - --PACKAGE=libcharset --VERSION=1.4 -- --AC_INIT([lib/localcharset.c]) - AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_HEADER([config.h]) - AC_PROG_MAKE_SET --AC_SUBST([PACKAGE]) --AC_SUBST([VERSION]) -+dnl AC_SUBST(PACKAGE) -+dnl AC_SUBST(VERSION) -+ -+AC_CONFIG_MACRO_DIR([m4]) - - dnl checks for basic programs - diff --git a/meta/recipes-support/libiconv/libiconv-1.14/autoconf.patch b/meta/recipes-support/libiconv/libiconv-1.14/autoconf.patch new file mode 100644 index 0000000000..5d34ce7c0e --- /dev/null +++ b/meta/recipes-support/libiconv/libiconv-1.14/autoconf.patch @@ -0,0 +1,50 @@ +It adds the variables that are needed +for autoconf 2.65 to reconfigure libiconv and delete the m4 macros +directory. Its imported from OE. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj + +Index: libiconv-1.13.1/configure.ac +=================================================================== +--- libiconv-1.13.1.orig/configure.ac ++++ libiconv-1.13.1/configure.ac +@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR([build-aux]) + AM_INIT_AUTOMAKE([libiconv], [1.13.1]) + AC_CONFIG_HEADERS([config.h lib/config.h]) + AC_PROG_MAKE_SET +- ++AC_CONFIG_MACRO_DIR([m4]) + dnl checks for basic programs + + AC_PROG_CC +Index: libiconv-1.13.1/libcharset/configure.ac +=================================================================== +--- libiconv-1.13.1.orig/libcharset/configure.ac ++++ libiconv-1.13.1/libcharset/configure.ac +@@ -16,17 +16,17 @@ dnl along with the GNU CHARSET Library; + dnl write to the Free Software Foundation, Inc., 51 Franklin Street, + dnl Fifth Floor, Boston, MA 02110-1301, USA. + +-AC_PREREQ([2.13]) ++AC_PREREQ(2.61) ++AC_INIT([libcharset],[1.4] ) ++AC_CONFIG_SRCDIR([lib/localcharset.c]) + +-PACKAGE=libcharset +-VERSION=1.4 +- +-AC_INIT([lib/localcharset.c]) + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_HEADER([config.h]) + AC_PROG_MAKE_SET +-AC_SUBST([PACKAGE]) +-AC_SUBST([VERSION]) ++dnl AC_SUBST(PACKAGE) ++dnl AC_SUBST(VERSION) ++ ++AC_CONFIG_MACRO_DIR([m4]) + + dnl checks for basic programs + diff --git a/meta/recipes-support/libiconv/libiconv_1.13.1.bb b/meta/recipes-support/libiconv/libiconv_1.13.1.bb deleted file mode 100644 index 6471e32d5b..0000000000 --- a/meta/recipes-support/libiconv/libiconv_1.13.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -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 \ - " - -SRC_URI[md5sum] = "7ab33ebd26687c744a37264a330bbe9a" -SRC_URI[sha256sum] = "55a36168306089009d054ccdd9d013041bfc3ab26be7033d107821f1c4949a49" - -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 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 -} diff --git a/meta/recipes-support/libiconv/libiconv_1.14.bb b/meta/recipes-support/libiconv/libiconv_1.14.bb new file mode 100644 index 0000000000..5eea823054 --- /dev/null +++ b/meta/recipes-support/libiconv/libiconv_1.14.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 \ + " + +SRC_URI[md5sum] = "e34509b1623cec449dfeb73d7ce9c6c6" +SRC_URI[sha256sum] = "72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613" + +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 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 +} -- cgit v1.2.3-54-g00ecf