From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 92EFE1382C5 for ; Mon, 14 May 2018 16:15:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4D1BE0918; Mon, 14 May 2018 16:15:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7E43CE0918 for ; Mon, 14 May 2018 16:15:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94B15335C84 for ; Mon, 14 May 2018 16:15:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71C0A260 for ; Mon, 14 May 2018 16:15:49 +0000 (UTC) From: "Michael Haubenwallner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Haubenwallner" Message-ID: <1526314491.0f1c69e0ff65843ea1845474c7f1f83075f01676.haubi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libiconv/, dev-libs/libiconv/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libiconv/files/libiconv-1.15-no-aix-tweaks.patch dev-libs/libiconv/libiconv-1.15.ebuild X-VCS-Directories: dev-libs/libiconv/ dev-libs/libiconv/files/ X-VCS-Committer: haubi X-VCS-Committer-Name: Michael Haubenwallner X-VCS-Revision: 0f1c69e0ff65843ea1845474c7f1f83075f01676 X-VCS-Branch: master Date: Mon, 14 May 2018 16:15:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7597822b-22fe-45cc-b5ed-3aeb40925643 X-Archives-Hash: 168f565b148e7e7d4b4632686c020e8f commit: 0f1c69e0ff65843ea1845474c7f1f83075f01676 Author: Michael Haubenwallner gentoo org> AuthorDate: Mon May 14 15:28:36 2018 +0000 Commit: Michael Haubenwallner gentoo org> CommitDate: Mon May 14 16:14:51 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f1c69e0 dev-libs/libiconv: avoid aix library tweaks Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../libiconv/files/libiconv-1.15-no-aix-tweaks.patch | 20 ++++++++++++++++++++ dev-libs/libiconv/libiconv-1.15.ebuild | 1 + 2 files changed, 21 insertions(+) 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 00000000000..d554d34564d --- /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 8dc2125675e..c991366b8ef 100644 --- 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() {