diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-02-15 04:21:58 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-02-15 04:21:58 +0000 |
| commit | 67bbbd5332774b947e16e8accd729123c4fec5a1 (patch) | |
| tree | 6ac14a43223c02d5b1437d7a22b8d336fb193d52 /media-gfx/graphviz/graphviz-2.26.3-r4.ebuild | |
| parent | Remove the need for git-r3 since there is a valid archive path (diff) | |
| download | gentoo-2-67bbbd5332774b947e16e8accd729123c4fec5a1.tar.gz gentoo-2-67bbbd5332774b947e16e8accd729123c4fec5a1.tar.bz2 gentoo-2-67bbbd5332774b947e16e8accd729123c4fec5a1.zip | |
Backport libtool logic from newer versions to fix building with newer autotools #539032 by Jeff.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'media-gfx/graphviz/graphviz-2.26.3-r4.ebuild')
| -rw-r--r-- | media-gfx/graphviz/graphviz-2.26.3-r4.ebuild | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild b/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild index 1affe207b3f6..cac27cf0efb1 100644 --- a/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild +++ b/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild,v 1.15 2015/02/15 02:18:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.26.3-r4.ebuild,v 1.16 2015/02/15 04:21:58 vapier Exp $ EAPI=3 PYTHON_DEPEND="python? 2" @@ -107,6 +107,7 @@ pkg_setup() { src_prepare() { epatch \ "${FILESDIR}"/${P}-libtool.patch \ + "${FILESDIR}"/${P}-libtool-configure.patch \ "${FILESDIR}"/${P}-automake-1.11.2.patch # ToDo: Do the same thing for examples and/or @@ -118,9 +119,9 @@ src_prepare() { fi # This is an old version of libtool + # use the ./configure option to exclude its use, and + # delete the dir since we don't need to eautoreconf it rm -rf libltdl - sed -i -e '/libltdl/d' configure.ac || die - sed -i -e 's/AC_LIBLTDL_CONVENIENCE/AC_LIBLTDL_INSTALLABLE/' configure.ac || die # no nls, no gettext, no iconv macro, so disable it use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; } @@ -139,7 +140,7 @@ src_prepare() { src_configure() { # libtool file collision, bug 276609 - local myconf="--disable-ltdl-install" + local myconf="--without-included-ltdl --disable-ltdl-install" # Core functionality: # All of X, cairo-output, gtk need the pango+cairo functionality |