diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2009-11-04 18:17:23 +0000 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2009-11-04 18:17:23 +0000 |
| commit | 4f522e75d427af5fde30dfa30ccc7bcb0fb43660 (patch) | |
| tree | a7c25621aaafc403d1ca6e40b3f59d583dbb404a /app-cdr/cdrtools | |
| parent | ia64/m68k/s390/sh stable wrt #286199 (diff) | |
| download | gentoo-2-4f522e75d427af5fde30dfa30ccc7bcb0fb43660.tar.gz gentoo-2-4f522e75d427af5fde30dfa30ccc7bcb0fb43660.tar.bz2 gentoo-2-4f522e75d427af5fde30dfa30ccc7bcb0fb43660.zip | |
Version bump. Fix comment position. Remove old.
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'app-cdr/cdrtools')
| -rw-r--r-- | app-cdr/cdrtools/ChangeLog | 8 | ||||
| -rw-r--r-- | app-cdr/cdrtools/cdrtools-2.01.01_alpha67.ebuild (renamed from app-cdr/cdrtools/cdrtools-2.01.01_alpha65.ebuild) | 19 |
2 files changed, 21 insertions, 6 deletions
diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog index 20efd862f7d4..f6a2ebcde8e7 100644 --- a/app-cdr/cdrtools/ChangeLog +++ b/app-cdr/cdrtools/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-cdr/cdrtools # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.236 2009/10/13 19:26:08 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.237 2009/11/04 18:17:23 billie Exp $ + +*cdrtools-2.01.01_alpha67 (04 Nov 2009) + + 04 Nov 2009; Pielmeier Daniel <billie@gentoo.org> + -cdrtools-2.01.01_alpha65.ebuild, +cdrtools-2.01.01_alpha67.ebuild: + Version bump. Fix comment position. Remove old. *cdrtools-2.01.01_alpha66 (13 Oct 2009) diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha65.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha67.ebuild index f1c6bb2fbaa1..f7090f1faa36 100644 --- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha65.ebuild +++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha67.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 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_alpha65.ebuild,v 1.1 2009/09/16 18:22:07 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha67.ebuild,v 1.1 2009/11/04 18:17:23 billie Exp $ EAPI=2 @@ -56,11 +56,20 @@ src_prepare() { sed -i "s:/usr/src/linux/include::g" Defaults.${MYARCH} || die "sed linux-include failed" sed -i "/RUNPATH/ c\RUNPATH= " Defaults.${MYARCH} || die "sed RUNPATH failed" - # For dynamic linking. - sed -i "s:static:dynamic:" Defaults.${MYARCH} || die "sed static-remove failed" + cd "${S}"/RULES + + # Respect CC/CXX variables + local tcCC=$(tc-getCC) + local tcCXX=$(tc-getCXX) + sed -i -e "/cc-config.sh/s/\$(C_ARCH:%64=%) \$(CCOM_DEF)/${tcCC} ${tcCC}/" \ + rules1.top || die "sed rules1.top failed" + sed -i -e "/^\(CC\|DYNLD\|LDCC\|MKDEP\)/s/gcc/${tcCC}/" \ + -e "/^\(CC++\|DYNLDC++\|LDCC++\|MKC++DEP\)/s/g++/${tcCXX}/" \ + cc-gcc.rul || die "sed cc-gcc.rul failed" + sed -i -e "s/^#CONFFLAGS +=\t-cc=\$(XCC_COM)$/CONFFLAGS +=\t-cc=${tcCC}/g" \ + rules.cnf || die "sed rules.cnf failed" # Create additional symlinks needed for some archs. - cd "${S}"/RULES local t for t in ppc64 sh4 s390x ; do ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die @@ -96,7 +105,7 @@ src_compile() { src_install() { # If not built with -j1, "sometimes" manpages are not installed. Bug? emake -j1 MANDIR="share/man" INS_BASE="${D}/usr/" INS_RBASE="${D}" \ - GMAKE_NOWARN="true" install + LINKMODE="dynamic" GMAKE_NOWARN="true" install # These symlinks are for compat with cdrkit. dosym schily /usr/include/scsilib |