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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A966815812D for ; Mon, 23 Dec 2024 10:48:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14247E0849; Mon, 23 Dec 2024 10:48:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EB806E0849 for ; Mon, 23 Dec 2024 10:48:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5D3B33D3CF for ; Mon, 23 Dec 2024 10:48:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F69AAF5 for ; Mon, 23 Dec 2024 10:48:16 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1734950580.746a758e853a814c59e52807a46181e5ebd41c6e.sam@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/Manifest dev-libs/libiconv/files/libiconv-1.18-fix-link-install.patch dev-libs/libiconv/libiconv-1.18.ebuild X-VCS-Directories: dev-libs/libiconv/files/ dev-libs/libiconv/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 746a758e853a814c59e52807a46181e5ebd41c6e X-VCS-Branch: master Date: Mon, 23 Dec 2024 10:48:16 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: adcfa222-143a-408d-8590-cb73e0da654f X-Archives-Hash: b00ca88b1204aa53aa7df1c61444e7b6 commit: 746a758e853a814c59e52807a46181e5ebd41c6e Author: Sam James gentoo org> AuthorDate: Mon Dec 23 10:43:00 2024 +0000 Commit: Sam James gentoo org> CommitDate: Mon Dec 23 10:43:00 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=746a758e dev-libs/libiconv: add 1.18 Signed-off-by: Sam James gentoo.org> dev-libs/libiconv/Manifest | 2 + .../files/libiconv-1.18-fix-link-install.patch | 12 +++++ dev-libs/libiconv/libiconv-1.18.ebuild | 60 ++++++++++++++++++++++ 3 files changed, 74 insertions(+) diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest index 734dfb0008d2..93896bb290d6 100644 --- a/dev-libs/libiconv/Manifest +++ b/dev-libs/libiconv/Manifest @@ -1 +1,3 @@ DIST libiconv-1.17.tar.gz 5413283 BLAKE2B 1d317dd0655c680a2082c38561cdff51ac1a9181d4734a8bb1e86861dfd66f1a6c0846a90b5b88f3b38b1fa9983d9e563551f27e95a8e329896b71becceae52b SHA512 18a09de2d026da4f2d8b858517b0f26d853b21179cf4fa9a41070b2d140030ad9525637dc4f34fc7f27abca8acdc84c6751dfb1d426e78bf92af4040603ced86 +DIST libiconv-1.18.tar.gz 5822590 BLAKE2B 374e7a7299d4814d372d8e63246c11f403f9fc990be5b129d016b92a875d2f8e9697ef4ef5cbd2e7b7fc97dff427c6b8abf6a99da792fcabd6fc36af38cd4723 SHA512 a55eb3b7b785a78ab8918db8af541c9e11deb5ff4f89d54483287711ed797d87848ce0eafffa7ce26d9a7adb4b5a9891cb484f94bd4f51d3ce97a6a47b4c719a +DIST libiconv-1.18.tar.gz.sig 833 BLAKE2B 30ca06b40201c08b871f1b62cecfb32c9489c97bc2d109566b993d30d8ee735b7e067d89676c48685da823ee532da61173f30b6c1956c30ef1da16d22dd35b4c SHA512 7814bb202b8d68041e4ee96427794a998e53e73ddf94a3ac81f78b08065aa7879d9c03e325e51f13b2d78361d163472cdc633be1c8f535150a3f0257b319ec52 diff --git a/dev-libs/libiconv/files/libiconv-1.18-fix-link-install.patch b/dev-libs/libiconv/files/libiconv-1.18-fix-link-install.patch new file mode 100644 index 000000000000..8091ca1b49fb --- /dev/null +++ b/dev-libs/libiconv/files/libiconv-1.18-fix-link-install.patch @@ -0,0 +1,12 @@ +don't link against the libtool archive to avoid recording ${D} in RUNPATH + +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -113,6 +113,7 @@ install : all force + if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi + case "@host_os@" in \ + hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \ ++ *) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \ + *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a @LTLIBINTL@ $(DESTDIR)$(libdir)/libiconv.la $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \ + esac + $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT) diff --git a/dev-libs/libiconv/libiconv-1.18.ebuild b/dev-libs/libiconv/libiconv-1.18.ebuild new file mode 100644 index 000000000000..6e9fc18574d3 --- /dev/null +++ b/dev-libs/libiconv/libiconv-1.18.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gettext.asc +inherit multilib-minimal verify-sig + +DESCRIPTION="GNU charset conversion library for libc which doesn't implement it" +HOMEPAGE="https://www.gnu.org/software/libiconv/" +SRC_URI=" + mirror://gnu/libiconv/${P}.tar.gz + verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig ) +" + +LICENSE="LGPL-2.1+ GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="prefix static-libs" + +DEPEND=" + !sys-libs/glibc + !sys-libs/musl +" +RDEPEND="${DEPEND}" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gettext )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.18-fix-link-install.patch +) + +multilib_src_configure() { + if use prefix ; then + # In Prefix we want to have the same header declaration on every + # platform, so make configure find that it should do + # "const char * *inbuf" + export am_cv_func_iconv=no + fi + + # Disable NLS support because that creates a circular dependency + # between libiconv and gettext + ECONF_SOURCE="${S}" \ + econf \ + --cache-file="${BUILD_DIR}"/config.cache \ + --docdir="\$(datarootdir)/doc/${PF}/html" \ + --disable-nls \ + --enable-shared \ + $(use_enable static-libs static) +} + +multilib_src_install_all() { + use static-libs || find "${ED}" -name 'lib*.la' -delete + + # We need to rename our copies, bug #503162 + cd "${ED}"/usr/share/man || die + local f + for f in man*/*.[0-9] ; do + mv "${f}" "${f%/*}/${PN}-${f#*/}" || die + done +}