diff options
| author |   Aron Griffis <agriffis@gentoo.org> | 2003-09-12 16:44:52 +0000 |
|---|---|---|
| committer | Aron Griffis <agriffis@gentoo.org> | 2003-09-12 16:44:52 +0000 |
| commit | bb8ff4590e672c8884c10cb45e7eb6b41f0fa519 (patch) | |
| tree | 716b68498ee517500f73c7faf15be53df9cd9682 /media-sound/lilypond | |
| parent | Dependency fixes, Bug #28524 (diff) | |
| download | gentoo-2-bb8ff4590e672c8884c10cb45e7eb6b41f0fa519.tar.gz gentoo-2-bb8ff4590e672c8884c10cb45e7eb6b41f0fa519.tar.bz2 gentoo-2-bb8ff4590e672c8884c10cb45e7eb6b41f0fa519.zip | |
fix part of bug 21305 by disallowing ccache during build
Diffstat (limited to 'media-sound/lilypond')
| -rw-r--r-- | media-sound/lilypond/ChangeLog | 5 | ||||
| -rw-r--r-- | media-sound/lilypond/Manifest | 6 | ||||
| -rw-r--r-- | media-sound/lilypond/lilypond-1.6.9.ebuild | 18 |
3 files changed, 20 insertions, 9 deletions
diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog index f5f9f3212153..73d715e9a803 100644 --- a/media-sound/lilypond/ChangeLog +++ b/media-sound/lilypond/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/lilypond # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.9 2003/05/27 09:06:31 jje Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.10 2003/09/12 16:44:48 agriffis Exp $ + + 12 Sep 2003; Aron Griffis <agriffis@gentoo.org> lilypond-1.6.9.ebuild: + Fix (part of) bug 21305 by disabling ccache. 27 May 2003; jje <jje@gentoo.org> lilypond-1.6.9.ebuild: Fixed web-doc target, die was missing... diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index 5605045843ea..a1bc4c45f011 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,7 +1,7 @@ -MD5 cedc51e21cdb5a1c5cc4d731d5a2fc40 ChangeLog 1843 MD5 191399a858d12633982583c1dd0ca4e5 lilypond-1.5.15.ebuild 758 +MD5 3ee1ffa989f5cb7d3b18fafc7edd1ffa lilypond-1.6.9.ebuild 3054 MD5 64ce9864da4f354f00f77c57640f8cae lilypond-1.6.6.ebuild 3050 -MD5 534e245ce6ee940d6af454de5741eb0c lilypond-1.6.9.ebuild 2862 -MD5 598b545eba349fc6f14f888818c1a8f7 files/digest-lilypond-1.5.15 68 +MD5 506c542e542be3822f83f0a54bd3f176 ChangeLog 1970 MD5 42dc732527fc9a940a950f3a498a8b48 files/digest-lilypond-1.6.6 67 MD5 be5450deeb374c228e7584c880fd8c08 files/digest-lilypond-1.6.9 67 +MD5 598b545eba349fc6f14f888818c1a8f7 files/digest-lilypond-1.5.15 68 diff --git a/media-sound/lilypond/lilypond-1.6.9.ebuild b/media-sound/lilypond/lilypond-1.6.9.ebuild index 6acf00023f12..4d8cce814157 100644 --- a/media-sound/lilypond/lilypond-1.6.9.ebuild +++ b/media-sound/lilypond/lilypond-1.6.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-1.6.9.ebuild,v 1.3 2003/08/07 04:06:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-1.6.9.ebuild,v 1.4 2003/09/12 16:44:48 agriffis Exp $ inherit gcc @@ -30,6 +30,10 @@ RDEPEND=">=dev-util/guile-1.4-r3 >=dev-lang/python-2.2.1-r2" src_compile() { + # Remove ccache from the PATH since it can break compilation of + # this package. See bug 21305 + PATH="$(echo ":${PATH}:" | sed 's/:[^:]*ccache[^:]*:/:/;s/^://;s/:$//;')" + # See http://lilypond.org/stable/Documentation/topdocs/out-www/INSTALL.html if [ "`gcc-major-version`" -eq "2" ]; then # Verified by agriffis 03 Dec 2002 using @@ -49,23 +53,27 @@ src_compile() { eerror "Unsupported GCC version, 2.95 and 3.2 are supported" die fi - use doc && (make prefix=${D}/usr \ + + if use doc; then + make web-doc \ + prefix=${D}/usr \ datadir=${D}/usr/share \ lilypond_data=${D}/usr/share/lilypond \ local_lilypond_datadir=${D}/usr/share/lilypond/${PV} \ topdir=${D}/usr \ - web-doc || die "make web-doc failed") + || die "make web-doc failed" + fi } src_install () { - make \ + make install \ prefix=${D}/usr \ mandir=${D}/usr/share/man \ infodir=${D}/usr/share/info \ datadir=${D}/usr/share \ lilypond_datadir=${D}/usr/share/lilypond \ local_lilypond_datadir=${D}/usr/share/lilypond/${PV} \ - install || die "make install failed" + || die "make install failed" dodoc AUTHORS* COPYING ChangeLog DEDICATION NEWS README.txt \ ROADMAP THANKS VERSION *.el insinto /usr/share/lilypond/${PV}/buildscripts/out |