diff options
| author |   Sam James <sam@gentoo.org> | 2021-03-27 15:18:44 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-03-27 15:34:47 +0000 |
| commit | 4ca6fa2c1d4ae5047c684371df7fd1cc7bf5effa (patch) | |
| tree | 2234f3c72fd78f1551559d01542674f4ae86fe09 /media-libs/libtiger | |
| parent | media-libs/libtiger: port to EAPI 7 (diff) | |
| download | gentoo-4ca6fa2c1d4ae5047c684371df7fd1cc7bf5effa.tar.gz gentoo-4ca6fa2c1d4ae5047c684371df7fd1cc7bf5effa.tar.bz2 gentoo-4ca6fa2c1d4ae5047c684371df7fd1cc7bf5effa.zip | |
media-libs/libtiger: fix build with slibtool
Thanks-to: orbea <orbea@riseup.net>
Closes: https://bugs.gentoo.org/778578
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-libs/libtiger')
3 files changed, 93 insertions, 2 deletions
diff --git a/media-libs/libtiger/files/libtiger-0.3.4-fix-autoreconf.patch b/media-libs/libtiger/files/libtiger-0.3.4-fix-autoreconf.patch new file mode 100644 index 000000000000..88b3316ea702 --- /dev/null +++ b/media-libs/libtiger/files/libtiger-0.3.4-fix-autoreconf.patch @@ -0,0 +1,59 @@ +https://bugs.gentoo.org/778578 + +From f3f463faa8cb73ffbdce172bddfa839eb65b2d0f Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Sat, 27 Mar 2021 07:44:14 -0700 +Subject: [PATCH 1/2] Build: Fix autoreconf. + +--- + Makefile.am | 2 +- + configure.ac | 3 ++- + doc/Makefile.am | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index c5d6b6e..746d893 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -11,7 +11,7 @@ tigerinc_HEADERS=include/tiger/tiger.h include/tiger/tiger_config.h + tigerpc_DATA=misc/pkgconfig/tiger.pc + noinst_DATA=misc/pkgconfig/tiger-uninstalled.pc + +-LIBTOOLFLAGS=--silent ++AM_LIBTOOLFLAGS=--silent + + AM_CPPFLAGS=-I $(top_srcdir)/src -I $(top_srcdir)/include + +diff --git a/configure.ac b/configure.ac +index 2f63684..a1cf2ae 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -26,6 +26,8 @@ dnl then set AGE to 0. + + LIBTIGER_SHARED_VERSION="5:2:0" + ++AM_PROG_AR ++ + AC_PROG_CC_C_O + AC_PROG_LIBTOOL + AC_PROG_GREP +@@ -35,7 +37,6 @@ AC_PROG_SED + AC_C_CONST + AC_C_INLINE + +- + # headers + + AC_HEADER_STDC +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 70d48c5..01e95d3 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -1,4 +1,4 @@ +-LIBTOOLFLAGS=--silent ++AM_LIBTOOLFLAGS=--silent + + # dependency to get doc to be built + noinst_DATA = .doc-dummy-target +-- +2.26.3 diff --git a/media-libs/libtiger/files/libtiger-0.3.4-fix-undefined-references-slibtool.patch b/media-libs/libtiger/files/libtiger-0.3.4-fix-undefined-references-slibtool.patch new file mode 100644 index 000000000000..01ccc22524ef --- /dev/null +++ b/media-libs/libtiger/files/libtiger-0.3.4-fix-undefined-references-slibtool.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/778578 + +From 0b990d5db74b5e5055753f4ad5006b8d89d23d26 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Sat, 27 Mar 2021 07:47:09 -0700 +Subject: [PATCH 2/2] build: Add -lm to fix undefined references. + +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 746d893..348bad0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -35,7 +35,7 @@ noinst_HEADERS=\ + lib_libtiger_la_CFLAGS=@CWARNFLAGS_FULL@ @CFLAGS_FORTIFY_SOURCE@ @CFLAGS_DEBUG@ @CFLAGS_PROFILE@ \ + @PANGOCAIRO_CFLAGS@ @KATE_CFLAGS@ @PTHREAD_CFLAGS@ + lib_libtiger_la_LIBADD=@PANGOCAIRO_LIBS@ @KATE_LIBS@ @PTHREAD_LIBS@ +-lib_libtiger_la_LDFLAGS=-version-info @LIBTIGER_SHARED_VERSION@ -no-undefined ++lib_libtiger_la_LDFLAGS=-version-info @LIBTIGER_SHARED_VERSION@ -no-undefined -lm + + am__tar = ${AMTAR} chof - --owner=0 --group=0 --exclude=CVS --exclude=.cvsignore "$$tardir" + +-- +2.26.3 diff --git a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild index 891f13de6bb4..ee5b7ef378fd 100644 --- a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild +++ b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit libtool multilib-minimal +inherit autotools multilib-minimal DESCRIPTION="A rendering library for Kate streams using Pango and Cairo" HOMEPAGE="https://code.google.com/p/libtiger/" @@ -25,9 +25,15 @@ BDEPEND=" doc? ( app-doc/doxygen ) " +PATCHES=( + "${FILESDIR}"/${PN}-0.3.4-fix-autoreconf.patch + "${FILESDIR}"/${PN}-0.3.4-fix-undefined-references-slibtool.patch +) + src_prepare() { default - elibtoolize + + eautoreconf } multilib_src_configure() { |