[gentoo-commits] gentoo-x86 commit in sys-devel/icecream/files: 0.9.0-create-env-multilib.patch 0.9.0-run-march-native-locally.patch

[gentoo-commits] gentoo-x86 commit in sys-devel/icecream/files: 0.9.0-create-env-multilib.patch 0.9.0-run-march-native-locally.patch

[Friedrich Oslage (bluebird)]

bluebird    08/06/12 18:32:37

  Added:                0.9.0-create-env-multilib.patch
                        0.9.0-run-march-native-locally.patch
  Log:
  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)

Revision  Changes    Path
1.1                  sys-devel/icecream/files/0.9.0-create-env-multilib.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/icecream/files/0.9.0-create-env-multilib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/icecream/files/0.9.0-create-env-multilib.patch?rev=1.1&content-type=text/plain

Index: 0.9.0-create-env-multilib.patch
===================================================================
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



1.1                  sys-devel/icecream/files/0.9.0-run-march-native-locally.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/icecream/files/0.9.0-run-march-native-locally.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/icecream/files/0.9.0-run-march-native-locally.patch?rev=1.1&content-type=text/plain

Index: 0.9.0-run-march-native-locally.patch
===================================================================
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)) {



-- 
gentoo-commits@lists.gentoo.org mailing list