summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2010-09-18 10:24:22 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2010-09-18 10:24:22 +0000
commit735f8b3c05700f4c51778288d221ac7c25071a8b (patch)
treeb06c9902166eec5ac82b381a09ecf892f4f10e5f /sys-devel
parentUnmask sys-apps/dbus-1.4.0, tested functional with several consumers, includi... (diff)
downloadgentoo-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')
-rw-r--r--sys-devel/icecream/ChangeLog10
-rw-r--r--sys-devel/icecream/files/0.9.6-crosscompile.patch12
-rw-r--r--sys-devel/icecream/files/icecream-create-env15
-rw-r--r--sys-devel/icecream/icecream-0.9.6-r1.ebuild (renamed from sys-devel/icecream/icecream-0.9.6.ebuild)3
4 files changed, 34 insertions, 6 deletions
diff --git a/sys-devel/icecream/ChangeLog b/sys-devel/icecream/ChangeLog
index 09a95a007e92..19aadb9c6196 100644
--- a/sys-devel/icecream/ChangeLog
+++ b/sys-devel/icecream/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for sys-devel/icecream
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/ChangeLog,v 1.38 2010/09/11 12:30:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/ChangeLog,v 1.39 2010/09/18 10:24:22 scarabeus Exp $
+
+*icecream-0.9.6-r1 (18 Sep 2010)
+
+ 18 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+ +files/0.9.6-crosscompile.patch, -icecream-0.9.6.ebuild,
+ +icecream-0.9.6-r1.ebuild, files/icecream-create-env:
+ Revision bump to fix CHOST/crosscompile problems per bug #275756 and bug
+ #303545.
*icecream-0.9.6 (11 Sep 2010)
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
diff --git a/sys-devel/icecream/icecream-0.9.6.ebuild b/sys-devel/icecream/icecream-0.9.6-r1.ebuild
index 3b1846ae21cc..a2450bb9b66f 100644
--- a/sys-devel/icecream/icecream-0.9.6.ebuild
+++ b/sys-devel/icecream/icecream-0.9.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/icecream-0.9.6.ebuild,v 1.1 2010/09/11 12:30:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/icecream-0.9.6-r1.ebuild,v 1.1 2010/09/18 10:24:22 scarabeus Exp $
EAPI=3
@@ -21,6 +21,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/${PV}-symlinks.patch"
+ "${FILESDIR}/${PV}-crosscompile.patch"
"${FILESDIR}/${PN}-conf.d-verbosity.patch"
"${FILESDIR}/${PN}-gentoo-multilib.patch"
)