| 1 |
commit: 6e8bc31c1d8693a07c81ca49a256f0b0ea3e3d85 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 16 15:59:15 2021 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 16 16:01:14 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e8bc31c |
| 7 |
|
| 8 |
dev-libs/libiconv-1.16: version bump |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/767244 |
| 11 |
Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3 |
| 12 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-libs/libiconv/Manifest | 1 + |
| 15 |
.../files/libiconv-1.16-fix-link-install.patch | 12 +++++ |
| 16 |
dev-libs/libiconv/libiconv-1.16.ebuild | 57 ++++++++++++++++++++++ |
| 17 |
3 files changed, 70 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest |
| 20 |
index a13b5faafe1..6d09de8d473 100644 |
| 21 |
--- a/dev-libs/libiconv/Manifest |
| 22 |
+++ b/dev-libs/libiconv/Manifest |
| 23 |
@@ -1 +1,2 @@ |
| 24 |
DIST libiconv-1.15.tar.gz 5264188 BLAKE2B 2384dbf8549fa56e841b15b7e2698b83c0ee171cdff13aef48c60eae0bc4f5e7b2e937bc8d5eddf89fba11412d17bebd77bdda7060c177ce9dc9be00172c0c12 SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a |
| 25 |
+DIST libiconv-1.16.tar.gz 5166734 BLAKE2B 8e7f4d64d757db6c3ffa973c9cebcf20b34f9859a547dbba8cebe3a4865bda86f33c5be197951877c46eff5a7fc00b1b11474fb3baa036f08ac2faf97eca138c SHA512 365dac0b34b4255a0066e8033a8b3db4bdb94b9b57a9dca17ebf2d779139fe935caf51a465d17fd8ae229ec4b926f3f7025264f37243432075e5583925bb77b7 |
| 26 |
|
| 27 |
diff --git a/dev-libs/libiconv/files/libiconv-1.16-fix-link-install.patch b/dev-libs/libiconv/files/libiconv-1.16-fix-link-install.patch |
| 28 |
new file mode 100644 |
| 29 |
index 00000000000..022613463a7 |
| 30 |
--- /dev/null |
| 31 |
+++ b/dev-libs/libiconv/files/libiconv-1.16-fix-link-install.patch |
| 32 |
@@ -0,0 +1,12 @@ |
| 33 |
+don't link against the libtool archive to avoid recording ${D} in RUNPATH |
| 34 |
+ |
| 35 |
+--- a/src/Makefile.in |
| 36 |
++++ b/src/Makefile.in |
| 37 |
+@@ -113,6 +113,7 @@ |
| 38 |
+ if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi |
| 39 |
+ case "@host_os@" in \ |
| 40 |
+ 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);; \ |
| 41 |
++ *) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \ |
| 42 |
+ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \ |
| 43 |
+ esac |
| 44 |
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT) |
| 45 |
|
| 46 |
diff --git a/dev-libs/libiconv/libiconv-1.16.ebuild b/dev-libs/libiconv/libiconv-1.16.ebuild |
| 47 |
new file mode 100644 |
| 48 |
index 00000000000..6962ed17625 |
| 49 |
--- /dev/null |
| 50 |
+++ b/dev-libs/libiconv/libiconv-1.16.ebuild |
| 51 |
@@ -0,0 +1,57 @@ |
| 52 |
+# Copyright 1999-2021 Gentoo Authors |
| 53 |
+# Distributed under the terms of the GNU General Public License v2 |
| 54 |
+ |
| 55 |
+EAPI=7 |
| 56 |
+ |
| 57 |
+inherit libtool multilib-minimal usr-ldscript |
| 58 |
+ |
| 59 |
+DESCRIPTION="GNU charset conversion library for libc which doesn't implement it" |
| 60 |
+HOMEPAGE="https://www.gnu.org/software/libiconv/" |
| 61 |
+SRC_URI="mirror://gnu/libiconv/${P}.tar.gz" |
| 62 |
+ |
| 63 |
+LICENSE="LGPL-2+ GPL-3+" |
| 64 |
+SLOT="0" |
| 65 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
| 66 |
+IUSE="prefix static-libs" |
| 67 |
+ |
| 68 |
+DEPEND="!sys-libs/glibc |
| 69 |
+ !sys-libs/musl |
| 70 |
+ !userland_GNU? ( !sys-apps/man-pages )" |
| 71 |
+RDEPEND="${DEPEND}" |
| 72 |
+ |
| 73 |
+PATCHES=( |
| 74 |
+ "${FILESDIR}/${PN}-1.15-no-gets.patch" |
| 75 |
+ "${FILESDIR}/${PN}-1.16-fix-link-install.patch" |
| 76 |
+) |
| 77 |
+ |
| 78 |
+multilib_src_configure() { |
| 79 |
+ if use prefix ; then |
| 80 |
+ # In Prefix we want to have the same header declaration on every |
| 81 |
+ # platform, so make configure find that it should do |
| 82 |
+ # "const char * *inbuf" |
| 83 |
+ export am_cv_func_iconv=no |
| 84 |
+ fi |
| 85 |
+ # Disable NLS support because that creates a circular dependency |
| 86 |
+ # between libiconv and gettext |
| 87 |
+ ECONF_SOURCE="${S}" \ |
| 88 |
+ econf \ |
| 89 |
+ --docdir="\$(datarootdir)/doc/${PF}/html" \ |
| 90 |
+ --disable-nls \ |
| 91 |
+ --enable-shared \ |
| 92 |
+ $(use_enable static-libs static) |
| 93 |
+} |
| 94 |
+ |
| 95 |
+multilib_src_install_all() { |
| 96 |
+ use static-libs || find "${ED}" -name 'lib*.la' -delete |
| 97 |
+ |
| 98 |
+ # If we have a GNU userland, we probably have sys-apps/man-pages |
| 99 |
+ # installed, which means we want to rename our copies #503162. |
| 100 |
+ # The use of USELAND=GNU is kind of a hack though ... |
| 101 |
+ if use userland_GNU ; then |
| 102 |
+ cd "${ED}"/usr/share/man || die |
| 103 |
+ local f |
| 104 |
+ for f in man*/*.[0-9] ; do |
| 105 |
+ mv "${f}" "${f%/*}/${PN}-${f#*/}" || die |
| 106 |
+ done |
| 107 |
+ fi |
| 108 |
+} |
Archives