[patch] ccc.patch

ccc.patch (text/plain), 2.54 KB, created by Markus Meier on 2009-02-08 16:42:56 UTC

Index: ccc.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ccc.eclass,v
retrieving revision 1.19
diff -u -B -r1.19 ccc.eclass
--- ccc.eclass	10 Sep 2008 08:20:05 -0000	1.19
+++ ccc.eclass	8 Feb 2009 16:39:38 -0000
@@ -70,7 +70,7 @@
 	#           regmatch_t __pmatch[__restrict_arr]
 	#
 
-	find ${WORKDIR} -iname '*.h' | \
+	find "${WORKDIR}" -iname '*.h' | \
 		xargs | ccc-fixup 's#\(\[__restrict\)_arr\]#\1\]#g'
 }
 
@@ -82,7 +82,7 @@
 	# lots of developers hardcode gcc into their
 	# Makefiles. Try and fix these.
 	#
-	find ${WORKDIR} -iname Makefile | \
+	find "${WORKDIR}" -iname Makefile | \
 		xargs | ccc-fixup "s#^\(CC.*=\).*g\?cc#\1${CC:-gcc}#g"
 }
 
@@ -93,7 +93,7 @@
 {
 	# lots of developers hardcode g++ into thier
 	# Makefiles. Try and fix these.
-	find ${WORKDIR} -iname Makefile | \
+	find "${WORKDIR}" -iname Makefile | \
 		xargs | ccc-fixup "s#^\(CXX.*=\).*[gc]\{1\}++#\1${CXX:-g++}#g"
 }
 
@@ -124,7 +124,7 @@
 {
 	# -g will stop ccc/cxx performing optimisation
 	# replacing it with -g3 will let them co-exist.
-	find ${WORKDIR} -iname Makefile | \
+	find "${WORKDIR}" -iname Makefile | \
 		xargs | ccc-fixup \
 		"s#\(^\CX\{,2\}FLAGS[[:space:]]*=.*[\'\"\x20\t]*\)-g\([\'\"\x20\t]\|$\)#\1-g3\2#g"
 	# FIXME: my eyes! it burns!
@@ -197,16 +197,16 @@
 	# create one by default
 	if [[ "${2}" == *.so ]]; then
 	# no version suffix.
-		${LD:-ld} -shared -o ${T}/${2##*/} -soname ${2##*/} \
+		${LD:-ld} -shared -o "${T}"/${2##*/} -soname ${2##*/} \
 			-whole-archive ${1} -no-whole-archive -lots ${LDFLAGS}
 	else
 	# version suffix
 		local so_version=${2##*.so}
-		${LD:-ld} -shared -o ${T}/${2##*/} -soname `basename ${2/${so_version}}` \
+		${LD:-ld} -shared -o "${T}"/${2##*/} -soname `basename ${2/${so_version}}` \
 				-whole-archive ${1} -no-whole-archive -lots ${LDFLAGS}
 	fi
 	# hand installation over to dolib.so
-	dolib.so ${T}/${2##*/}
+	dolib.so "${T}"/${2##*/}
 }
 
 # @FUNCTION: append-ldflags
@@ -284,8 +284,8 @@
 	if [ "${1##*.}" == "a" ] && [ -f "${1}" ]; then
 		einfo "otsifying `basename ${1}` ..."
 
-		mkdir ${T}/ccc-otsify-${$}
-		cd ${T}/ccc-otsify-${$}
+		mkdir "${T}"/ccc-otsify-${$}
+		cd "${T}"/ccc-otsify-${$}
 
 		einfo "	extracting archive members from libots ..."
 		ar ${ar_args}x /usr/lib/libots.a || {
@@ -294,7 +294,7 @@
 		}
 
 		einfo "	appending libots members to `basename ${1}` ..."
-		ar ${ar_args}q ${1} ${T}/ccc-otsify-${$}/*.o || {
+		ar ${ar_args}q ${1} "${T}"/ccc-otsify-${$}/*.o || {
 			eerror "	failed to append libots members to ${1}."
 			return 1
 		}