[gentoo-commits] gentoo-x86 commit in sys-devel/icecream/files: icecream-create-env 0.9.6-crosscompile.patch

[gentoo-commits] gentoo-x86 commit in sys-devel/icecream/files: icecream-create-env 0.9.6-crosscompile.patch

[Tomas Chvatal (scarabeus)]

scarabeus    10/09/18 10:24:22

  Modified:             icecream-create-env
  Added:                0.9.6-crosscompile.patch
  Log:
  Revision bump to fix CHOST/crosscompile problems per bug #275756 and bug #303545.
  
  (Portage version: 2.2_rc83/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  sys-devel/icecream/files/icecream-create-env

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/icecream/files/icecream-create-env?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/icecream/files/icecream-create-env?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/icecream/files/icecream-create-env?r1=1.3&r2=1.4

Index: icecream-create-env
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/icecream/files/icecream-create-env,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- icecream-create-env	11 Sep 2010 12:30:59 -0000	1.3
+++ icecream-create-env	18 Sep 2010 10:24:22 -0000	1.4
@@ -10,7 +10,7 @@
 #
 #
 # Usage: "./icecream-create-env" creates a native environment(similar to icecc --build-native)
-#		 "./icecream-create-env CHOST" creates a cross-compile environment using the cross-toolchain created by crossdev
+#		 "./icecream-create-env prefix" creates a cross-compile environment using the cross-toolchain created by crossdev
 # Example:
 #        "emerge crossdev && crossdev -t sparc-unknown-linux-gnu && icecream-create-env sparc-unknown-linux"
 
@@ -47,11 +47,18 @@
 tmpdir=`mktemp -d`
 tmpfile=`mktemp`
 
-if [ "`gcc -dumpmachine`" = "${prefix}" ]
+target=`gcc -dumpmachine`
+if [ "x${target}" = "x${prefix}" ]
 then
-	/usr/lib/icecc/icecc-create-env /usr/${prefix}/gcc-bin/${version}/gcc /usr/${prefix}/gcc-bin/${version}/g++ | tee ${tmpfile}
+	/usr/lib/icecc/icecc-create-env \
+		/usr/${prefix}/gcc-bin/${version}/gcc \
+		/usr/${prefix}/gcc-bin/${version}/g++ \
+		| tee ${tmpfile}
 else
-	/usr/lib/icecc/icecc-create-env /usr/${CHOST}/${prefix}/gcc-bin/${version}/${prefix}-gcc /usr/${CHOST}/${prefix}/gcc-bin/${version}/${prefix}-g++ | tee ${tmpfile}
+	/usr/lib/icecc/icecc-create-env \
+		/usr/${target}/${prefix}/gcc-bin/${version}/${prefix}-gcc \
+		/usr/${target}/${prefix}/gcc-bin/${version}/${prefix}-g++ \
+		| tee ${tmpfile}
 fi
 
 # figure out the name of the archive



1.1                  sys-devel/icecream/files/0.9.6-crosscompile.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/icecream/files/0.9.6-crosscompile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/icecream/files/0.9.6-crosscompile.patch?rev=1.1&content-type=text/plain

Index: 0.9.6-crosscompile.patch
===================================================================
diff -urN icecc-0.9.6.old//client/icecc-create-env icecc-0.9.6//client/icecc-create-env
--- icecc-0.9.6.old//client/icecc-create-env	2010-09-18 12:10:08.143391700 +0200
+++ icecc-0.9.6//client/icecc-create-env	2010-09-18 12:10:46.574391700 +0200
@@ -97,7 +97,7 @@
 
 add_file $added_gcc /usr/bin/gcc
 add_file $added_gxx /usr/bin/g++
-add_file /usr/bin/as
+add_file `$added_gcc -print-prog-name=as` /usr/bin/as
 
 if test "$is_darwin" = 1; then
     # add dynamic linker