diff options
| author |   Friedrich Oslage <bluebird@gentoo.org> | 2008-06-12 18:32:36 +0000 |
|---|---|---|
| committer | Friedrich Oslage <bluebird@gentoo.org> | 2008-06-12 18:32:36 +0000 |
| commit | 24a87574963d25ad186c6483b5da728e2c65b12f (patch) | |
| tree | 06fefe831ad84f9b98a637154d77e316dc9ee848 /sys-devel/icecream/files | |
| parent | Fix xulrunner depends, bug #217160 (diff) | |
| download | gentoo-2-24a87574963d25ad186c6483b5da728e2c65b12f.tar.gz gentoo-2-24a87574963d25ad186c6483b5da728e2c65b12f.tar.bz2 gentoo-2-24a87574963d25ad186c6483b5da728e2c65b12f.zip | |
fix bug #223159(always run jobs locally when using -march=native) and bug #183586(lib, lib64 issue on amd64 when running icecc --build-native)
(Portage version: 2.1.4.4)
Diffstat (limited to 'sys-devel/icecream/files')
| -rw-r--r-- | sys-devel/icecream/files/0.9.0-create-env-multilib.patch | 30 | ||||
| -rw-r--r-- | sys-devel/icecream/files/0.9.0-run-march-native-locally.patch | 16 |
2 files changed, 46 insertions, 0 deletions
diff --git a/sys-devel/icecream/files/0.9.0-create-env-multilib.patch b/sys-devel/icecream/files/0.9.0-create-env-multilib.patch new file mode 100644 index 000000000000..643b8790545c --- /dev/null +++ b/sys-devel/icecream/files/0.9.0-create-env-multilib.patch @@ -0,0 +1,30 @@ +diff -urN icecream.orig/icecc-create-env icecream/icecc-create-env +--- icecream.orig/client/icecc-create-env ++++ icecream/client/icecc-create-env +@@ -11,6 +11,16 @@ + is_darwin=1 + fi + ++lib_is_symlink=0 ++if test -L /lib; then ++ lib_is_symlink=1 ++ real_libdir="`readlink /lib`" ++ if [[ "`readlink /usr/lib`" != "$real_libdir" ]]; then ++ echo "Hmmm, /lib is a symlink to $real_libdir but /usr/lib is not...this doesn't look sane!" ++ exit 1 ++ fi ++fi ++ + is_contained () + { + case " $target_files " in +@@ -55,6 +65,9 @@ + # and prefer that on the assumption that it is a more generic one. + local baselib=`echo "$lib" | sed 's,\(/[^/]*\)/.*\(/[^/]*\)$,\1\2,'` + test -f "$baselib" && lib=$baselib ++ if test "$lib_is_symlink" = 1; then ++ lib="${lib/\/lib\///$real_libdir/}" ++ fi + add_file "$lib" + done + fi diff --git a/sys-devel/icecream/files/0.9.0-run-march-native-locally.patch b/sys-devel/icecream/files/0.9.0-run-march-native-locally.patch new file mode 100644 index 000000000000..fe89637b61cc --- /dev/null +++ b/sys-devel/icecream/files/0.9.0-run-march-native-locally.patch @@ -0,0 +1,16 @@ +diff -urN icecream.orig/client/arg.cpp icecream/client/arg.cpp +--- icecream.orig/client/arg.cpp ++++ icecream/client/arg.cpp +@@ -182,6 +182,12 @@ + #endif + always_local = true; + args.append(a, Arg_Local); ++ } else if (!strcmp(a, "-march=native") || !strcmp(a, "-mcpu=native") || !strcmp(a, "-mtune=native")) { ++#if CLIENT_DEBUG ++ log_info() << "-{march,mpcu,mtune}=native optimizes for local machine; must be local" << endl; ++#endif ++ always_local = true; ++ args.append(a, Arg_Local); + } else if (!strcmp(a, "-c")) { + seen_c = true; + } else if (str_startswith("-o", a)) { |