jjohnstn pushed to eclipse-cdt (master). "Fix llvm toolchain enablement (..more)"

[notifications at fedoraproject.org]

>From f56d290aa6c774b1ea91a766911c5d29b0c77881 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn at redhat.com>
Date: Thu, 9 Apr 2015 18:35:59 -0400
Subject: Fix llvm toolchain enablement

- Resolves: #1210051

diff --git a/eclipse-cdt-llvm.patch b/eclipse-cdt-llvm.patch
new file mode 100644
index 0000000..2c66777
--- /dev/null
+++ b/eclipse-cdt-llvm.patch
@@ -0,0 +1,26 @@
+diff -up ./llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmEnvironmentVariableSupplier.java.fix ./llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmEnvironmentVariableSupplier.java
+--- ./llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmEnvironmentVariableSupplier.java.fix	2015-04-09 17:36:06.036633957 -0400
++++ ./llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmEnvironmentVariableSupplier.java	2015-04-09 17:36:14.861778317 -0400
+@@ -260,18 +260,16 @@ public class LlvmEnvironmentVariableSupp
+ 	 * @return Full path for LLVM executable if valid, otherwise null
+ 	 */
+ 	private static String getDirIfLlvmFound(String candidatePath, String subPath) {
+-		String llvmPath = null;
++		String llvmPath = candidatePath;
+ 		// If there is a trailing / or \, remove it
+-		if (candidatePath.endsWith(Separators.getFileSeparator()) && candidatePath.length() > 1) {
+-			llvmPath = candidatePath.substring(0, candidatePath.length() - 1);
++		if (llvmPath.endsWith(Separators.getFileSeparator()) && llvmPath.length() > 1) {
++			llvmPath = llvmPath.substring(0, candidatePath.length() - 1);
+ 		}
+ 		// If subPath exists and is not empty -> append it to candidatePath.
+ 		if (null != subPath && !subPath.isEmpty()) {
+ 			// Form full path.
+-			llvmPath = candidatePath + Separators.getFileSeparator() + subPath;
++			llvmPath = llvmPath + Separators.getFileSeparator() + subPath;
+ 		}
+-		if (llvmPath == null)
+-			return null;
+ 		// Return a full path for LLVM executable if it's valid, otherwise null.
+ 		return getBinDirIfLlvm_ar(llvmPath);
+ 	}
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index f0b1abd..2546a82 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -28,7 +28,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           %{?scl_prefix}eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -81,6 +81,9 @@ Patch9: %{pkg_name}-cdtdebug-readme.patch
 # Following fixes jetty reqs in CDT target
 Patch10: %{pkg_name}-target.patch
 
+# Following fixes llvm toolchain enablement for CDT
+Patch11: %{pkg_name}-llvm.patch
+
 BuildRequires: tycho
 BuildRequires: tycho-extras
 BuildRequires: %{?scl_prefix}eclipse-pde >= 1:4.3.0
@@ -163,6 +166,7 @@ pushd %{cdt_snapshot}
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
 # Add secondary arch support if we are building there
 %ifarch %{arm} s390 s390x aarch64
@@ -487,6 +491,10 @@ rm -rf $installDir/eclipse/binary
 %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
 
 %changelog
+* Thu Apr 09 2015 Jeff Johnston <jjohnstn at redhat.com> - 1:8.6.0-2
+- Fix llvm toolchain enablement
+- Resolves: #1210051
+
 * Thu Feb 26 2015 Roland Grunberg <rgrunber at redhat.com> - 1:8.6.0-1
 - Update to Luna SR2 release 8.6.0.
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/eclipse-cdt.git/commit/?h=master&id=f56d290aa6c774b1ea91a766911c5d29b0c77881