diff options
| author | Saul Wold <sgw@linux.intel.com> | 2011-07-09 19:48:07 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-19 17:33:55 +0100 |
| commit | bd1e627bef29830f9346b4b984905fd8fcf2e716 (patch) | |
| tree | 9b0a37228f3333abd15224c8df0b46cd6d9cfbbb /meta/recipes-support/libiconv/files/autoconf.patch | |
| parent | b975de5ea76c5f8827fb48c0c3c29902872ad3d6 (diff) | |
| download | openembedded-core-bd1e627bef29830f9346b4b984905fd8fcf2e716.tar.gz openembedded-core-bd1e627bef29830f9346b4b984905fd8fcf2e716.tar.bz2 openembedded-core-bd1e627bef29830f9346b4b984905fd8fcf2e716.tar.xz openembedded-core-bd1e627bef29830f9346b4b984905fd8fcf2e716.zip | |
libiconv: add version 1.13.1
Keep older libiconv 1.11.1 as 1.13.1 is now LGPLv3
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-support/libiconv/files/autoconf.patch')
| -rw-r--r-- | meta/recipes-support/libiconv/files/autoconf.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-support/libiconv/files/autoconf.patch b/meta/recipes-support/libiconv/files/autoconf.patch new file mode 100644 index 000000000..3cbf549d4 --- /dev/null +++ b/meta/recipes-support/libiconv/files/autoconf.patch @@ -0,0 +1,50 @@ +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 <raj.khem@gmail.com> + +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 + |