summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2008-10-01 12:51:27 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2008-10-01 12:51:27 +0000
commit848ad1ff6149aff5cff766c885942e60f99ca4c4 (patch)
treeb3e8e0e872a828802db947bb6e9edb6ed1adc32b /app-cdr/cdrtools
parentamd64 stable, bug #170220 (diff)
downloadgentoo-2-848ad1ff6149aff5cff766c885942e60f99ca4c4.tar.gz
gentoo-2-848ad1ff6149aff5cff766c885942e60f99ca4c4.tar.bz2
gentoo-2-848ad1ff6149aff5cff766c885942e60f99ca4c4.zip
If not built with -j1, "sometimes" cdda2wav will not be built, make will complete anyway. Nasty bug.
(Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc8 x86_64)
Diffstat (limited to 'app-cdr/cdrtools')
-rw-r--r--app-cdr/cdrtools/ChangeLog9
-rw-r--r--app-cdr/cdrtools/cdrtools-2.01.01_alpha50-r3.ebuild (renamed from app-cdr/cdrtools/cdrtools-2.01.01_alpha50-r2.ebuild)9
2 files changed, 12 insertions, 6 deletions
diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index ab0a319ba78d..d492bc1ea592 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-cdr/cdrtools
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.210 2008/09/30 23:03:13 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.211 2008/10/01 12:51:27 loki_val Exp $
+
+*cdrtools-2.01.01_alpha50-r3 (01 Oct 2008)
+
+ 01 Oct 2008; Peter Alfredsen <loki_val@gentoo.org>
+ -cdrtools-2.01.01_alpha50-r2.ebuild, +cdrtools-2.01.01_alpha50-r3.ebuild:
+ If not built with -j1, "sometimes" cdda2wav will not be built, make will
+ complete anyway. Nasty bug.
*cdrtools-2.01.01_alpha50-r2 (30 Sep 2008)
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha50-r2.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha50-r3.ebuild
index ab115db9b40e..915f010ca52f 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha50-r2.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha50-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha50-r2.ebuild,v 1.1 2008/09/30 23:03:13 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha50-r3.ebuild,v 1.1 2008/10/01 12:51:27 loki_val Exp $
inherit multilib eutils toolchain-funcs flag-o-matic
@@ -82,13 +82,12 @@ src_compile() {
fi
fi
- #Watch out for an elusive parallel make bug, that may yet occur.
-
- emake CC="$(tc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" || die
+ #If not built with -j1, "sometimes" cdda2wav will not be built. Nasty bug.
+ emake -j1 CC="$(tc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" || die
}
src_install() {
- emake MANDIR="share/man" INS_BASE="${D}/usr/" install
+ make MANDIR="share/man" INS_BASE="${D}/usr/" install
#These symlinks are for compat with cdrkit.
dosym schily /usr/include/scsilib