dev-libs/libiconv: avoid aix library tweaks

Package-Manager: Portage-2.3.24, Repoman-2.3.6

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 (file)
index 0000000..d554d34
--- /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 && \

diff --git a/dev-libs/libiconv/libiconv-1.15.ebuild b/dev-libs/libiconv/libiconv-1.15.ebuild
index 8dc2125675ea927510000f0a312673c39f9b567f..c991366b8effdd305f37d66058c2a2ecdc7bc1be 100644 (file)
--- a/dev-libs/libiconv/libiconv-1.15.ebuild
+++ b/dev-libs/libiconv/libiconv-1.15.ebuild
@@ -20,6 +20,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
        "${FILESDIR}/${PN}-1.15-no-gets.patch"
+       "${FILESDIR}/${PN}-1.15-no-aix-tweaks.patch"
 )
 
 src_prepare() {