summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haubenwallner <haubi@gentoo.org>2018-05-14 17:28:36 +0200
committerMichael Haubenwallner <haubi@gentoo.org>2018-05-14 18:14:51 +0200
commit0f1c69e0ff65843ea1845474c7f1f83075f01676 (patch)
treeadc3c09cb860da7fd0d8084dc0e9b4de6b1a5f34 /dev-libs/libiconv/files
parentdev-python/nose-1.3.7-r3: alpha stable (diff)
downloadgentoo-0f1c69e0ff65843ea1845474c7f1f83075f01676.tar.gz
gentoo-0f1c69e0ff65843ea1845474c7f1f83075f01676.tar.bz2
gentoo-0f1c69e0ff65843ea1845474c7f1f83075f01676.zip
dev-libs/libiconv: avoid aix library tweaks
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'dev-libs/libiconv/files')
-rw-r--r--dev-libs/libiconv/files/libiconv-1.15-no-aix-tweaks.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/dev-libs/libiconv/files/libiconv-1.15-no-aix-tweaks.patch b/dev-libs/libiconv/files/libiconv-1.15-no-aix-tweaks.patch
new file mode 100644
index 000000000000..d554d34564de
--- /dev/null
+++ b/dev-libs/libiconv/files/libiconv-1.15-no-aix-tweaks.patch
@@ -0,0 +1,20 @@
+http://lists.gnu.org/archive/html/bug-gnu-libiconv/2018-05/msg00004.html
+
+--- libiconv-1.15/lib/Makefile.in
++++ libiconv-1.15/lib/Makefile.in
+@@ -100,12 +100,14 @@
+
+ # On AIX, libiconv.a must include the object files of /lib/libiconv.a,
+ # otherwise the setlocale() call fails when invoked from executables linked
+-# with -rpath $(libdir), even if linked without -liconv.
++# with -rpath $(libdir), even if linked without -liconv. However, since
++# the --with-aix-soname flag libtool may not create libiconv.a at all.
+ install : all force
+ if [ ! -d $(DESTDIR)$(libdir) ] ; then $(mkinstalldirs) $(DESTDIR)$(libdir) ; fi
+ $(LIBTOOL_INSTALL) $(INSTALL) libiconv.la $(DESTDIR)$(libdir)/libiconv.la
+ case "@host_os@" in \
+ aix*) (cd $(DESTDIR)$(libdir) && \
++ { test -e libiconv.a || exit 0; } && \
+ objects=`ar t libiconv.a`" "`ar t /lib/libiconv.a` && \
+ ar x libiconv.a && ar x /lib/libiconv.a && \
+ ar q libiconv.new.a $$objects && \