diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2012-10-10 17:57:23 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-10-10 17:57:23 +0000 |
commit | a8587b5d422bf0d5488895bf564151a37223fdb1 (patch) | |
tree | 873784c5610b4e69d6c6f2c1e4233359e137fd0f /package/libs/libiconv-full/patches/200-work-with-libtool2.patch | |
parent | a49d72d71381b332451d076a51fea2a6e385ceab (diff) | |
download | upstream-a8587b5d422bf0d5488895bf564151a37223fdb1.tar.gz upstream-a8587b5d422bf0d5488895bf564151a37223fdb1.tar.bz2 upstream-a8587b5d422bf0d5488895bf564151a37223fdb1.zip |
libiconv-full: move to trunk and add myself as maintainer
SVN-Revision: 33711
Diffstat (limited to 'package/libs/libiconv-full/patches/200-work-with-libtool2.patch')
-rw-r--r-- | package/libs/libiconv-full/patches/200-work-with-libtool2.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/package/libs/libiconv-full/patches/200-work-with-libtool2.patch b/package/libs/libiconv-full/patches/200-work-with-libtool2.patch new file mode 100644 index 0000000000..6e31967f3c --- /dev/null +++ b/package/libs/libiconv-full/patches/200-work-with-libtool2.patch @@ -0,0 +1,17 @@ +Make iconv 1.11.x link correctly with libtool2 - argument "-Xcompiler" ensures "-shared" is passed to $(CC) when used as linker. Otherwise $(CC) tries to create an executable and fails while looking for a main()-function + +diff -ruN libiconv-1.11.1/lib/Makefile.in libiconv-1.11.1.mod/lib/Makefile.in +--- libiconv-1.11.1/lib/Makefile.in 2006-07-14 15:18:42.000000000 +0200 ++++ libiconv-1.11.1.mod/lib/Makefile.in 2010-12-01 20:47:57.000000000 +0100 +@@ -70,9 +70,9 @@ + + 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) -Xcompiler -shared -o 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) -Xcompiler -shared -o preloadable_libiconv_linux.so; \ + fi + + preloadable_libiconv_solaris.so : $(SOURCES) |