diff options
author | 2014-04-06 23:54:32 +0000 | |
---|---|---|
committer | 2014-04-06 23:54:32 +0000 | |
commit | dce0c023caaa686ca75a8ba0fff245cb40dc7553 (patch) | |
tree | 9fd2f8abfbf0e17d1d8fe14d1905586782c7d2d5 /app-text/epstool | |
parent | Clean up patch (diff) | |
download | gentoo-2-dce0c023caaa686ca75a8ba0fff245cb40dc7553.tar.gz gentoo-2-dce0c023caaa686ca75a8ba0fff245cb40dc7553.tar.bz2 gentoo-2-dce0c023caaa686ca75a8ba0fff245cb40dc7553.zip |
Fix parallel make issue (bug #506978). Clean up patch.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'app-text/epstool')
-rw-r--r-- | app-text/epstool/ChangeLog | 8 | ||||
-rw-r--r-- | app-text/epstool/epstool-3.08-r1.ebuild | 12 | ||||
-rw-r--r-- | app-text/epstool/files/gcc43.patch | 4 |
3 files changed, 16 insertions, 8 deletions
diff --git a/app-text/epstool/ChangeLog b/app-text/epstool/ChangeLog index dc4c961e4e9e..34853239c37a 100644 --- a/app-text/epstool/ChangeLog +++ b/app-text/epstool/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/epstool -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/epstool/ChangeLog,v 1.38 2013/09/24 07:43:06 pinkbyte Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/epstool/ChangeLog,v 1.39 2014/04/06 23:54:32 jer Exp $ + + 06 Apr 2014; Jeroen Roovers <jer@gentoo.org> epstool-3.08-r1.ebuild, + files/gcc43.patch: + Fix parallel make issue (bug #506978). Clean up patch. 24 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> -epstool-3.08.ebuild: Drop old revision diff --git a/app-text/epstool/epstool-3.08-r1.ebuild b/app-text/epstool/epstool-3.08-r1.ebuild index 2556006faba7..1666cdfb3f23 100644 --- a/app-text/epstool/epstool-3.08-r1.ebuild +++ b/app-text/epstool/epstool-3.08-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/epstool/epstool-3.08-r1.ebuild,v 1.6 2013/09/23 17:36:27 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/epstool/epstool-3.08-r1.ebuild,v 1.7 2014/04/06 23:54:32 jer Exp $ EAPI="5" @@ -18,15 +18,19 @@ DEPEND="app-text/ghostscript-gpl" RDEPEND="${DEPEND}" src_prepare() { - epatch "${FILESDIR}/gcc43.patch" + epatch "${FILESDIR}"/gcc43.patch sed -i \ -e '/^CC/s/=/?=/' \ -e '/^CLINK/s/gcc/$(CC)/' \ - src/unixcom.mak || die 'sed on src/unixcom.mak failed' + src/unixcom.mak || die tc-export CC epatch_user + + # parallel make issue (bug #506978) + mkdir bin || die + mkdir epsobj || die } src_compile() { diff --git a/app-text/epstool/files/gcc43.patch b/app-text/epstool/files/gcc43.patch index 398ce08c5182..b50250a9af1a 100644 --- a/app-text/epstool/files/gcc43.patch +++ b/app-text/epstool/files/gcc43.patch @@ -1,5 +1,5 @@ ---- epstool-3.08.orig/src/epstool.c 2005-06-10 04:41:00.000000000 -0500 -+++ epstool-3.08/src/epstool.c 2009-02-16 20:55:43.186140029 -0600 +--- a/src/epstool.c ++++ b/src/epstool.c @@ -2824,7 +2824,7 @@ code = -1; } |