summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannik Glückert <jannik.glueckert@gmail.com>2022-03-18 13:16:09 +0100
committerSam James <sam@gentoo.org>2022-03-20 21:54:59 +0000
commitc486d45e663d50280ff5b72f95d33661ab72279a (patch)
treee72bfc3285011acd2b832231bd04fc1fd5b5e0b1 /media-libs/lib3ds
parentmedia-sound/ardour: drop stale dev-cpp/libgnomecanvasmm dependency (diff)
downloadgentoo-c486d45e663d50280ff5b72f95d33661ab72279a.tar.gz
gentoo-c486d45e663d50280ff5b72f95d33661ab72279a.tar.bz2
gentoo-c486d45e663d50280ff5b72f95d33661ab72279a.zip
media-libs/lib3ds: always call eautoreconf (old libtool has clang bug)
Closes: https://bugs.gentoo.org/835577 Signed-off-by: Jannik Glückert <jannik.glueckert@gmail.com> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-libs/lib3ds')
-rw-r--r--media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch45
-rw-r--r--media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild9
-rw-r--r--media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild11
3 files changed, 17 insertions, 48 deletions
diff --git a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch b/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch
deleted file mode 100644
index af9040883c10..000000000000
--- a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 562d1412a705b6667bc9fa594133366fb7e787ab
-Author: hasufell <hasufell@gentoo.org>
-Date: Thu Sep 26 20:49:44 2013 +0200
-
- avoid autoreconf
-
-diff --git a/examples/3ds2obj/Makefile.in b/examples/3ds2obj/Makefile.in
-index 1b5b1fe..d2fda8a 100644
---- a/examples/3ds2obj/Makefile.in
-+++ b/examples/3ds2obj/Makefile.in
-@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_srcdir)/src
- 3ds2obj_SOURCES = 3ds2obj.c
--LDADD = $(top_builddir)/src/lib3ds.la
-+LDADD = $(top_builddir)/src/lib3ds.la -lm
- EXTRA_DIST = 3ds2obj.vcproj
- all: all-am
-
-diff --git a/examples/3dsdump/Makefile.in b/examples/3dsdump/Makefile.in
-index 4c915cc..f9f7bba 100644
---- a/examples/3dsdump/Makefile.in
-+++ b/examples/3dsdump/Makefile.in
-@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_srcdir)/src
- 3dsdump_SOURCES = 3dsdump.c
--LDADD = $(top_builddir)/src/lib3ds.la
-+LDADD = $(top_builddir)/src/lib3ds.la -lm
- EXTRA_DIST = 3dsdump.vcproj
- all: all-am
-
-diff --git a/examples/cube/Makefile.in b/examples/cube/Makefile.in
-index 76b7946..1c4b5b6 100644
---- a/examples/cube/Makefile.in
-+++ b/examples/cube/Makefile.in
-@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_srcdir)/src
- cube_SOURCES = cube.c
--LDADD = $(top_builddir)/src/lib3ds.la
-+LDADD = $(top_builddir)/src/lib3ds.la -lm
- EXTRA_DIST = cube.vcproj cube.tga
- all: all-am
-
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
index 22bfc9ac8e31..d5158e9289e8 100644
--- a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
+++ b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
@@ -3,6 +3,8 @@
EAPI=7
+inherit autotools
+
DESCRIPTION="library for managing 3D-Studio Release 3 and 4 .3DS files"
HOMEPAGE="https://code.google.com/p/lib3ds/"
SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
@@ -18,6 +20,13 @@ PATCHES=(
"${FILESDIR}"/${P}-mesh.c.patch
)
+src_prepare() {
+ default
+
+ # Always eautoreconf to renew libtool (e.g. Clang)
+ eautoreconf
+}
+
src_configure() {
econf $(use_enable static-libs static)
}
diff --git a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
index b7da0c9e8a8c..653a994cfb71 100644
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
@@ -3,6 +3,8 @@
EAPI=7
+inherit autotools
+
MY_PV="20080909"
MY_P="${PN}-${MY_PV}"
@@ -18,9 +20,12 @@ BDEPEND="app-arch/unzip"
S="${WORKDIR}/${MY_P}"
-PATCHES=(
- "${FILESDIR}"/${P}-underlinking-no-autoreconf.patch
-)
+src_prepare() {
+ default
+
+ # Always eautoreconf to renew libtool (e.g. Clang)
+ eautoreconf
+}
src_configure() {
econf $(use_enable static-libs static)