packages: llvm/llvm.spec, llvm/llvm-pld.patch (NEW) Detect PLD GCC triplet....

[wolf]

Author: wolf                         Date: Sun Apr 17 15:37:07 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
Detect PLD GCC triplet. Probably needs to be fixed for arch != x86.

---- Files affected:
packages/llvm:
   llvm.spec (1.21 -> 1.22) , llvm-pld.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/llvm/llvm.spec
diff -u packages/llvm/llvm.spec:1.21 packages/llvm/llvm.spec:1.22
--- packages/llvm/llvm.spec:1.21	Sun Apr 17 16:23:01 2011
+++ packages/llvm/llvm.spec	Sun Apr 17 17:37:01 2011
@@ -26,6 +26,7 @@
 # Source1-md5:	634de18d04b7a4ded19ec4c17d23cfca
 # Data files should be installed with timestamps preserved
 Patch3:		%{name}-2.6-timestamp.patch
+Patch4:		%{name}-pld.patch
 URL:		http://llvm.org/
 BuildRequires:	bash
 BuildRequires:	bison
@@ -191,6 +192,9 @@
 %setup -q -a1
 mv clang-*.* tools/clang
 %patch3 -p1
+%patch4 -p1
+
+sed -i 's|triplet-plox-here|%{_host}|' tools/clang/lib/Driver/ToolChains.cpp
 
 # configure does not properly specify libdir
 sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}|g' Makefile.config.in
@@ -404,6 +408,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2011/04/17 15:37:01  wolf
+Detect PLD GCC triplet. Probably needs to be fixed for arch != x86.
+
 Revision 1.21  2011/04/17 14:23:01  wolf
 - up to 2.9
 

================================================================
Index: packages/llvm/llvm-pld.patch
diff -u /dev/null packages/llvm/llvm-pld.patch:1.1
--- /dev/null	Sun Apr 17 17:37:07 2011
+++ packages/llvm/llvm-pld.patch	Sun Apr 17 17:37:01 2011
@@ -0,0 +1,13 @@
+diff -ruN llvm-2.9./tools/clang/lib/Driver/ToolChains.cpp llvm-2.9/tools/clang/lib/Driver/ToolChains.cpp
+--- llvm-2.9./tools/clang/lib/Driver/ToolChains.cpp	2011-03-21 22:29:27.000000000 +0100
++++ llvm-2.9/tools/clang/lib/Driver/ToolChains.cpp	2011-04-17 16:57:06.471923892 +0200
+@@ -1447,6 +1447,9 @@
+     else if (!llvm::sys::fs::exists("/usr/lib/gcc/i586-suse-linux", Exists) &&
+              Exists)
+       GccTriple = "i586-suse-linux";
++    else if (!llvm::sys::fs::exists("/usr/lib/gcc/triplet-plox-here", Exists) &&
++             Exists)
++      GccTriple = "triplet-plox-here";
+   }
+ 
+   const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/llvm/llvm.spec?r1=1.21&r2=1.22&f=u