From 32ca3e079838e8a4575958c779f9730980dd6770 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Sat, 9 Jul 2011 19:48:07 -0700 Subject: 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 Signed-off-by: Richard Purdie --- .../libiconv/libiconv-1.11.1/autoconf.patch | 48 ---------------------- .../shared_preloadable_libiconv_linux.patch | 24 ----------- 2 files changed, 72 deletions(-) delete mode 100644 meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch delete mode 100644 meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch (limited to 'meta/recipes-support/libiconv/libiconv-1.11.1') diff --git a/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch b/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch deleted file mode 100644 index 2b24894e51..0000000000 --- a/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch +++ /dev/null @@ -1,48 +0,0 @@ -It adds the variables that are needed -for autoconf 2.65 to reconfigure libiconv and defines the m4 macros -directory. Its imported from OE. - -Signed-off-by: Khem Raj - -Index: libiconv-1.11.1/configure.ac -=================================================================== ---- libiconv-1.11.1.orig/configure.ac -+++ libiconv-1.11.1/configure.ac -@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR(build-aux) - AM_INIT_AUTOMAKE(libiconv, 1.11) - 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.11.1/libcharset/configure.ac -=================================================================== ---- libiconv-1.11.1.orig/libcharset/configure.ac -+++ libiconv-1.11.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.11.1/shared_preloadable_libiconv_linux.patch b/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch deleted file mode 100644 index a913dad825..0000000000 --- a/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch +++ /dev/null @@ -1,24 +0,0 @@ -With libtool generating shared and static version of libraries needs -fPIC flags -without this it will not generate the commands to create shared linked library -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 - -Signed-off-by: Khem Raj - -Index: libiconv-1.11.1/lib/Makefile.in -=================================================================== ---- libiconv-1.11.1.orig/lib/Makefile.in -+++ libiconv-1.11.1/lib/Makefile.in -@@ -70,9 +70,9 @@ preloadable_libiconv.so : preloadable_li - - preloadable_libiconv_linux.so : $(SOURCES) - if test -n "@GCC@"; then \ -- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \ -+ $(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; \ - else \ -- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \ -+ $(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; \ - fi - - preloadable_libiconv_solaris.so : $(SOURCES) -- cgit v1.2.3-54-g00ecf