diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2009-11-14 19:10:39 +0000 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2009-11-14 19:10:39 +0000 |
| commit | 2605a77fdc79499cc0d277434fa0313723b1eaae (patch) | |
| tree | 27d70db68b56e90d355c49978d30f88112b463b4 /app-cdr/cdrtools | |
| parent | version bump, bug #293149 (diff) | |
| download | gentoo-2-2605a77fdc79499cc0d277434fa0313723b1eaae.tar.gz gentoo-2-2605a77fdc79499cc0d277434fa0313723b1eaae.tar.bz2 gentoo-2-2605a77fdc79499cc0d277434fa0313723b1eaae.zip | |
Replace slashes as separator in sed expressions as $(tc-getCC) or $(tc-getCXX) can return a full path which contains slashes, this in turn makes sed fail.
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'app-cdr/cdrtools')
| -rw-r--r-- | app-cdr/cdrtools/ChangeLog | 7 | ||||
| -rw-r--r-- | app-cdr/cdrtools/cdrtools-2.01.01_alpha67-r1.ebuild | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog index 1884d964fb6e..39b8bc3feba8 100644 --- a/app-cdr/cdrtools/ChangeLog +++ b/app-cdr/cdrtools/ChangeLog @@ -1,6 +1,11 @@ # 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.238 2009/11/04 22:35:31 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.239 2009/11/14 19:10:39 billie Exp $ + + 14 Nov 2009; Daniel Pielmeier <billie@gentoo.org> + cdrtools-2.01.01_alpha67-r1.ebuild: + Replace slashes as separator in sed expressions as $(tc-getCC) or + $(tc-getCXX) can return a full path which contains slashes. *cdrtools-2.01.01_alpha67-r1 (04 Nov 2009) diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha67-r1.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha67-r1.ebuild index 03154a28ac1d..124877b642b6 100644 --- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha67-r1.ebuild +++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha67-r1.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_alpha67-r1.ebuild,v 1.1 2009/11/04 22:35:31 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha67-r1.ebuild,v 1.2 2009/11/14 19:10:39 billie Exp $ EAPI=2 @@ -61,12 +61,12 @@ src_prepare() { # 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}/" \ + 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}/" \ + 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" \ + 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. |