diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2010-09-18 10:24:22 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-09-18 10:24:22 +0000 |
| commit | 735f8b3c05700f4c51778288d221ac7c25071a8b (patch) | |
| tree | b06c9902166eec5ac82b381a09ecf892f4f10e5f /sys-devel/icecream/files | |
| parent | Unmask sys-apps/dbus-1.4.0, tested functional with several consumers, includi... (diff) | |
| download | gentoo-2-735f8b3c05700f4c51778288d221ac7c25071a8b.tar.gz gentoo-2-735f8b3c05700f4c51778288d221ac7c25071a8b.tar.bz2 gentoo-2-735f8b3c05700f4c51778288d221ac7c25071a8b.zip | |
Revision bump to fix CHOST/crosscompile problems per bug #275756 and bug #303545.
(Portage version: 2.2_rc83/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel/icecream/files')
| -rw-r--r-- | sys-devel/icecream/files/0.9.6-crosscompile.patch | 12 | ||||
| -rw-r--r-- | sys-devel/icecream/files/icecream-create-env | 15 |
2 files changed, 23 insertions, 4 deletions
diff --git a/sys-devel/icecream/files/0.9.6-crosscompile.patch b/sys-devel/icecream/files/0.9.6-crosscompile.patch new file mode 100644 index 000000000000..990072bbb8fd --- /dev/null +++ b/sys-devel/icecream/files/0.9.6-crosscompile.patch @@ -0,0 +1,12 @@ +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 diff --git a/sys-devel/icecream/files/icecream-create-env b/sys-devel/icecream/files/icecream-create-env index 632bdc5bd2dd..4ee85f9cfede 100644 --- a/sys-devel/icecream/files/icecream-create-env +++ b/sys-devel/icecream/files/icecream-create-env @@ -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 @@ version="`${prefix}-gcc -dumpversion`" 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 |