diff options
author | Harald van Dijk <truedfx@gentoo.org> | 2007-08-06 16:35:37 +0000 |
---|---|---|
committer | Harald van Dijk <truedfx@gentoo.org> | 2007-08-06 16:35:37 +0000 |
commit | fa14f9f036a6eea2be3b3eb5c02baf8debe1334f (patch) | |
tree | 344f652f3a73a7e6e4d916155490680d7f83598e /dev-lang | |
parent | Fix syntax error in makedepend.SH (diff) | |
download | gentoo-2-fa14f9f036a6eea2be3b3eb5c02baf8debe1334f.tar.gz gentoo-2-fa14f9f036a6eea2be3b3eb5c02baf8debe1334f.tar.bz2 gentoo-2-fa14f9f036a6eea2be3b3eb5c02baf8debe1334f.zip |
Fix syntax error in makedepend.SH
(Portage version: 2.1.3.3)
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/perl/ChangeLog | 6 | ||||
-rw-r--r-- | dev-lang/perl/files/perl-5.8.8-makedepend-syntax.patch | 11 | ||||
-rw-r--r-- | dev-lang/perl/perl-5.8.8-r2.ebuild | 6 |
3 files changed, 21 insertions, 2 deletions
diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog index 853ce870edd5..b7c325f2debd 100644 --- a/dev-lang/perl/ChangeLog +++ b/dev-lang/perl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/perl # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.245 2007/08/06 10:21:33 ian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.246 2007/08/06 16:35:36 truedfx Exp $ + + 06 Aug 2007; Harald van Dijk <truedfx@gentoo.org> + +files/perl-5.8.8-makedepend-syntax.patch, perl-5.8.8-r2.ebuild: + Fix syntax error in makedepend.SH 06 Aug 2007; Christian Hartmann <ian@gentoo.org> perl-5.8.8-r2.ebuild: Bug #187866 - added suggested fix diff --git a/dev-lang/perl/files/perl-5.8.8-makedepend-syntax.patch b/dev-lang/perl/files/perl-5.8.8-makedepend-syntax.patch new file mode 100644 index 000000000000..147d49937b5c --- /dev/null +++ b/dev-lang/perl/files/perl-5.8.8-makedepend-syntax.patch @@ -0,0 +1,11 @@ +--- perl-5.8.8/makedepend.SH ++++ perl-5.8.8/makedepend.SH +@@ -128,7 +128,7 @@ + *.y) filebase=`basename $file .y` ;; + esac + case "$file" in +- */*) finc="-I`echo $file | sed 's#/[^/]*$##`" ;; ++ */*) finc="-I`echo $file | sed 's#/[^/]*$##'`" ;; + *) finc= ;; + esac + $echo "Finding dependencies for $filebase$_o." diff --git a/dev-lang/perl/perl-5.8.8-r2.ebuild b/dev-lang/perl/perl-5.8.8-r2.ebuild index 9af7ab8d5818..e26fcb060bdd 100644 --- a/dev-lang/perl/perl-5.8.8-r2.ebuild +++ b/dev-lang/perl/perl-5.8.8-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r2.ebuild,v 1.36 2007/08/06 10:21:33 ian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r2.ebuild,v 1.37 2007/08/06 16:35:36 truedfx Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -98,6 +98,10 @@ src_unpack() { # rac 2004.06.09 cd ${S}; epatch ${FILESDIR}/${PN}-noksh.patch + # makedepend.SH contains a syntax error which is ignored by bash but causes + # dash to abort + epatch ${FILESDIR}/${P}-makedepend-syntax.patch + # We do not want the build root in the linked perl module's RUNPATH, so # strip paths containing PORTAGE_TMPDIR if its set. This is for the # MakeMaker module, bug #105054. |