[OE-core] [PATCH v2] libiconv: Fix build failure on 1.13.1

[Khem Raj]

It needs a different patch for 1.13.1 for autoconf'ing
Rename files to libiconv-1.11.1 and have a separate
directory for libiconv-1.13.1

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../{files => libiconv-1.11.1}/autoconf.patch      |    0
 .../shared_preloadable_libiconv_linux.patch        |    0
 .../{files => libiconv-1.13.1}/autoconf.patch      |   32 ++++++++++----------
 meta/recipes-support/libiconv/libiconv_1.13.1.bb   |    3 +-
 4 files changed, 17 insertions(+), 18 deletions(-)
 copy meta/recipes-support/libiconv/{files => libiconv-1.11.1}/autoconf.patch (100%)
 rename meta/recipes-support/libiconv/{files => libiconv-1.11.1}/shared_preloadable_libiconv_linux.patch (100%)
 rename meta/recipes-support/libiconv/{files => libiconv-1.13.1}/autoconf.patch (57%)

diff --git a/meta/recipes-support/libiconv/files/autoconf.patch b/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
similarity index 100%
copy from meta/recipes-support/libiconv/files/autoconf.patch
copy to meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
diff --git a/meta/recipes-support/libiconv/files/shared_preloadable_libiconv_linux.patch b/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
similarity index 100%
rename from meta/recipes-support/libiconv/files/shared_preloadable_libiconv_linux.patch
rename to meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
diff --git a/meta/recipes-support/libiconv/files/autoconf.patch b/meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch
similarity index 57%
rename from meta/recipes-support/libiconv/files/autoconf.patch
rename to meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch
index 3cbf549..5d34ce7 100644
--- a/meta/recipes-support/libiconv/files/autoconf.patch
+++ b/meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch
@@ -1,33 +1,33 @@
 It adds the variables that are needed
-for autoconf 2.65 to reconfigure libiconv and defines the m4 macros 
+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 <raj.khem at gmail.com>
 
-Index: libiconv-1.11.1/configure.ac
+Index: libiconv-1.13.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)
+--- 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.11.1/libcharset/configure.ac
+Index: libiconv-1.13.1/libcharset/configure.ac
 ===================================================================
---- libiconv-1.11.1.orig/libcharset/configure.ac
-+++ libiconv-1.11.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.13])
 +AC_PREREQ(2.61)
 +AC_INIT([libcharset],[1.4] )
 +AC_CONFIG_SRCDIR([lib/localcharset.c])
@@ -35,12 +35,12 @@ Index: libiconv-1.11.1/libcharset/configure.ac
 -PACKAGE=libcharset
 -VERSION=1.4
 -
--AC_INIT(lib/localcharset.c)
- AC_CONFIG_AUX_DIR(build-aux)
- AC_CONFIG_HEADER(config.h)
+-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)
+-AC_SUBST([PACKAGE])
+-AC_SUBST([VERSION])
 +dnl AC_SUBST(PACKAGE)
 +dnl AC_SUBST(VERSION)
 +
diff --git a/meta/recipes-support/libiconv/libiconv_1.13.1.bb b/meta/recipes-support/libiconv/libiconv_1.13.1.bb
index 026f530..6471e32 100644
--- a/meta/recipes-support/libiconv/libiconv_1.13.1.bb
+++ b/meta/recipes-support/libiconv/libiconv_1.13.1.bb
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://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] = "7ab33ebd26687c744a37264a330bbe9a"
@@ -26,5 +25,5 @@ EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable"
 LEAD_SONAME = "libiconv.so"
 
 do_configure_prepend () {
-	rm -f m4/libtool.m4 libcharset/m4/libtool.m4
+	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
 }
-- 
1.7.4.1