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 | a1461b0de947c3caddfe1560ae13f7fc8502361d (patch) | |
| tree | a7aa3c57ae1819f8f63e7c5483589c16513b327b /app-cdr/cdrtools | |
| parent | version bump, bug #293149 (diff) | |
| download | historical-a1461b0de947c3caddfe1560ae13f7fc8502361d.tar.gz historical-a1461b0de947c3caddfe1560ae13f7fc8502361d.tar.bz2 historical-a1461b0de947c3caddfe1560ae13f7fc8502361d.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.
Package-Manager: portage-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/Manifest | 4 | ||||
| -rw-r--r-- | app-cdr/cdrtools/cdrtools-2.01.01_alpha67-r1.ebuild | 10 |
3 files changed, 13 insertions, 8 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/Manifest b/app-cdr/cdrtools/Manifest index 19dfd1963a3d..344d5f197c07 100644 --- a/app-cdr/cdrtools/Manifest +++ b/app-cdr/cdrtools/Manifest @@ -6,7 +6,7 @@ DIST cdrtools-2.01.01a66.tar.bz2 1842467 RMD160 150461c3bd140ac00afafc5bd2359c57 DIST cdrtools-2.01.01a67.tar.bz2 1846740 RMD160 83909a50e91b1650003cd3d82449826186567a96 SHA1 3df25c2bcc8c18360bd864581484956190eb45b3 SHA256 c53658617fb71c80d709b9cb677f442143f73344b8345be043499f2b66aba3f0 EBUILD cdrtools-2.01.01_alpha57-r1.ebuild 3741 RMD160 e33768607c3eb47dac4c0d0316404fcab34bad3e SHA1 3b34dde1f622724ba233b10a3b1d8947c11c2e45 SHA256 cc9c4ea9e7f580b91d4d6b19254a309bb8599d2ea1596a16a249101f6fd10943 EBUILD cdrtools-2.01.01_alpha66.ebuild 3829 RMD160 31fa919c2c01f664e0445f56ae83405b0ad29ddf SHA1 9482c8a850e2f63023575913c1ca1a814f8b0504 SHA256 2a98ec8150cd68929cc3796dabe3c3109006bafd923834c3e814951de6073e05 -EBUILD cdrtools-2.01.01_alpha67-r1.ebuild 3851 RMD160 bb354d81593090641bbf6b3da26d62b6bf687150 SHA1 ad497199c766882a43bbb106fea8f34c4fe2ccbf SHA256 630b0ff66992b3be84f3e03774f7b3ff46d633861c20afad32a432a2fa315d2c +EBUILD cdrtools-2.01.01_alpha67-r1.ebuild 3851 RMD160 6fcc348bb452668b579aaff558ed5a78f137ead0 SHA1 1796f9c9ac0834bd11624a341839b8fdfb5ec9d4 SHA256 6a31f121ba3f106fc767c29d4956c118f8ae93aae449982a9c88ce56afb0bb2b EBUILD cdrtools-2.01.01_alpha67.ebuild 3829 RMD160 1e007641fce82e774ddf84521aff6959073b350f SHA1 0ff9dad38c79d0f68c7000652b9e8994b20e461a SHA256 7b73bb9ee3409a2616dd57c1751b5f0fecb5f68209c04e27696455234975bc74 -MISC ChangeLog 37387 RMD160 2a94922a2069edc7ea8b4bcf3938a0201c200ece SHA1 202e35e252d991cc7a6f51b7883bced43c421102 SHA256 87b2eb04cd315a24adcf2a41fb736d883c5271a59ff620e77df1730d3e265e85 +MISC ChangeLog 37608 RMD160 1805900c5f46d0ee1799b796899580f7708b26b8 SHA1 a5699e956895096d84d1e9cb27916687b8494cc8 SHA256 e40f23db70c4dc84bd00b79bc0edc0b2b00ec2c9ac3218ec4afa4f1e4c85ba6a MISC metadata.xml 254 RMD160 f274a70fa23d8064efddcce296e0aed3344bd86b SHA1 ab52ea446603ae6242dae41e0c90fcf7ae8f09cf SHA256 21400abf2dad3e5b7b0d2f7f9586c33cba6336b42a97e1f2b3e7e8b9db0daae5 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. |