From 03700281db70e961bde015ce8727d578afc9705b Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Mon, 18 Mar 2019 08:31:20 +0100 Subject: media-libs/giflib: Revbump to fix LDFLAGS and man page installation Closes: https://bugs.gentoo.org/680826 Thanks-to: Arfrever Frehtes Taifersar Arahesis Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler --- media-libs/giflib/files/giflib-5.1.8-gentoo.patch | 8 ++- media-libs/giflib/giflib-5.1.8-r1.ebuild | 77 ++++++++++++++++++++++ media-libs/giflib/giflib-5.1.8.ebuild | 78 ----------------------- 3 files changed, 84 insertions(+), 79 deletions(-) create mode 100644 media-libs/giflib/giflib-5.1.8-r1.ebuild delete mode 100644 media-libs/giflib/giflib-5.1.8.ebuild diff --git a/media-libs/giflib/files/giflib-5.1.8-gentoo.patch b/media-libs/giflib/files/giflib-5.1.8-gentoo.patch index 225f1df1be52..90a72685d343 100644 --- a/media-libs/giflib/files/giflib-5.1.8-gentoo.patch +++ b/media-libs/giflib/files/giflib-5.1.8-gentoo.patch @@ -1,6 +1,6 @@ --- giflib-5.1.8/Makefile +++ giflib-5.1.8/Makefile -@@ -61,7 +61,6 @@ +@@ -61,12 +61,11 @@ LDLIBS=libgif.a -lm all: libgif.so libgif.a $(UTILS) @@ -8,3 +8,9 @@ $(UTILS):: libgif.a + libgif.so: $(OBJECTS) $(HEADERS) +- $(CC) $(CFLAGS) -shared $(OFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS) ++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS) + + libgif.a: $(OBJECTS) $(HEADERS) + $(AR) rcs libgif.a $(OBJECTS) diff --git a/media-libs/giflib/giflib-5.1.8-r1.ebuild b/media-libs/giflib/giflib-5.1.8-r1.ebuild new file mode 100644 index 000000000000..e16390f179c9 --- /dev/null +++ b/media-libs/giflib/giflib-5.1.8-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal toolchain-funcs + +DESCRIPTION="Library to handle, display and manipulate GIF images" +HOMEPAGE="https://sourceforge.net/projects/giflib/" +SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/7" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc static-libs" + +DEPEND="doc? ( app-text/xmlto )" + +PATCHES=( + "${FILESDIR}"/${PN}-5.1.8-gentoo.patch +) + +src_prepare() { + default + multilib_copy_sources +} + +multilib_src_compile() { + # Use reallocarray() from libc if available. + if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_GNU_SOURCE -o "${T}/reallocarray_test" -x c - <<< $'#include \nint main() {void *p = reallocarray(NULL, 0, 0);}' 2> /dev/null; then + local -x CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -DHAVE_REALLOCARRAY" + sed -e "s/ openbsd-reallocarray\.c//" -i Makefile || die + rm openbsd-reallocarray.c || die + fi + + emake \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS} -std=gnu99 -fPIC -Wno-format-truncation" \ + LDFLAGS="${LDFLAGS}" \ + OFLAGS="" \ + all + + if use doc && multilib_is_native_abi; then + emake -C doc + fi +} + +multilib_src_install() { + emake \ + DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + install + + if ! use static-libs ; then + find "${ED}" -name "*.a" -delete || die + fi + + if use doc && multilib_is_native_abi; then + docinto html + dodoc doc/*.html + fi +} + +multilib_src_install_all() { + docinto + dodoc ChangeLog NEWS README TODO + if use doc ; then + dodoc doc/*.txt + docinto html + dodoc -r doc/whatsinagif + fi +} + +multilib_src_test() { + emake -j1 check +} diff --git a/media-libs/giflib/giflib-5.1.8.ebuild b/media-libs/giflib/giflib-5.1.8.ebuild deleted file mode 100644 index f84e6fa760a9..000000000000 --- a/media-libs/giflib/giflib-5.1.8.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal toolchain-funcs - -DESCRIPTION="Library to handle, display and manipulate GIF images" -HOMEPAGE="https://sourceforge.net/projects/giflib/" -SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/7" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc static-libs" - -DEPEND="doc? ( app-text/xmlto )" - -PATCHES=( - "${FILESDIR}"/${PN}-5.1.8-gentoo.patch -) - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_compile() { - # Use reallocarray() from libc if available. - if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_GNU_SOURCE -o "${T}/reallocarray_test" -x c - <<< $'#include \nint main() {void *p = reallocarray(NULL, 0, 0);}' 2> /dev/null; then - local -x CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -DHAVE_REALLOCARRAY" - sed -e "s/ openbsd-reallocarray\.c//" -i Makefile || die - rm openbsd-reallocarray.c || die - fi - - emake \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS} -std=gnu99 -fPIC -Wno-format-truncation" \ - LDFLAGS="${LDFLAGS}" \ - OFLAGS="" \ - all - - if use doc && multilib_is_native_abi; then - emake -C doc - fi -} - -multilib_src_install() { - emake \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - MANDIR="${EPREFIX}/usr/share/man/man1" \ - install - - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi - - if use doc && multilib_is_native_abi; then - docinto html - dodoc doc/*.html - fi -} - -multilib_src_install_all() { - docinto - dodoc ChangeLog NEWS README TODO - if use doc ; then - dodoc doc/*.txt - docinto html - dodoc -r doc/whatsinagif - fi -} - -multilib_src_test() { - emake -j1 check -} -- cgit v1.2.3-65-gdbad