summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libiconv/libiconv-1.11.1
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-07-09 19:48:07 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-19 17:34:17 +0100
commit32ca3e079838e8a4575958c779f9730980dd6770 (patch)
tree63ea42834b591d97d3d34d6ba1d4a8ef02f726db /meta/recipes-support/libiconv/libiconv-1.11.1
parentfa4bcfdb73167f8159b88e5a4d711c0d37627a70 (diff)
downloadpoky-32ca3e079838e8a4575958c779f9730980dd6770.tar.gz
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 <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libiconv/libiconv-1.11.1')
-rw-r--r--meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch48
-rw-r--r--meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch24
2 files changed, 0 insertions, 72 deletions
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 @@
1It adds the variables that are needed
2for autoconf 2.65 to reconfigure libiconv and defines the m4 macros
3directory. Its imported from OE.
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7Index: libiconv-1.11.1/configure.ac
8===================================================================
9--- libiconv-1.11.1.orig/configure.ac
10+++ libiconv-1.11.1/configure.ac
11@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR(build-aux)
12 AM_INIT_AUTOMAKE(libiconv, 1.11)
13 AC_CONFIG_HEADERS(config.h lib/config.h)
14 AC_PROG_MAKE_SET
15-
16+AC_CONFIG_MACRO_DIR([m4])
17 dnl checks for basic programs
18
19 AC_PROG_CC
20Index: libiconv-1.11.1/libcharset/configure.ac
21===================================================================
22--- libiconv-1.11.1.orig/libcharset/configure.ac
23+++ libiconv-1.11.1/libcharset/configure.ac
24@@ -16,17 +16,17 @@ dnl along with the GNU CHARSET Library;
25 dnl write to the Free Software Foundation, Inc., 51 Franklin Street,
26 dnl Fifth Floor, Boston, MA 02110-1301, USA.
27
28-AC_PREREQ(2.13)
29+AC_PREREQ(2.61)
30+AC_INIT([libcharset],[1.4] )
31+AC_CONFIG_SRCDIR([lib/localcharset.c])
32
33-PACKAGE=libcharset
34-VERSION=1.4
35-
36-AC_INIT(lib/localcharset.c)
37 AC_CONFIG_AUX_DIR(build-aux)
38 AC_CONFIG_HEADER(config.h)
39 AC_PROG_MAKE_SET
40-AC_SUBST(PACKAGE)
41-AC_SUBST(VERSION)
42+dnl AC_SUBST(PACKAGE)
43+dnl AC_SUBST(VERSION)
44+
45+AC_CONFIG_MACRO_DIR([m4])
46
47 dnl checks for basic programs
48
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 @@
1With libtool generating shared and static version of libraries needs -fPIC flags
2without this it will not generate the commands to create shared linked library
3Its more enforced by libtool 2.4. I have not checked it with older libtool
4libiconv 1.11.x is relatively old release and libtool 2.4 did not exist when it
5was released these kind of problem are more likely
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8
9Index: libiconv-1.11.1/lib/Makefile.in
10===================================================================
11--- libiconv-1.11.1.orig/lib/Makefile.in
12+++ libiconv-1.11.1/lib/Makefile.in
13@@ -70,9 +70,9 @@ preloadable_libiconv.so : preloadable_li
14
15 preloadable_libiconv_linux.so : $(SOURCES)
16 if test -n "@GCC@"; then \
17- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \
18+ $(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; \
19 else \
20- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \
21+ $(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; \
22 fi
23
24 preloadable_libiconv_solaris.so : $(SOURCES)