[eclipse-cdt/f17] Add arm build support. Resolves: #815969 - Libhover not working for Juno M6 build 0.4.

[Jeff Johnston]

commit 3338275466a2cab5a408ac3713070e17fa80c0d8
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Thu Apr 26 10:42:14 2012 -0400

    Add arm build support.
    Resolves: #815969 - Libhover not working for Juno M6 build 0.4.

 eclipse-cdt-libhover.patch                       |   12 +++++
 eclipse-cdt-ppc64-add_ldflags.patch              |   22 ----------
 eclipse-cdt-ppc64-add_xopen_source-include.patch |   22 ----------
 eclipse-cdt.spec                                 |   48 +++++++++++----------
 4 files changed, 37 insertions(+), 67 deletions(-)
---
diff --git a/eclipse-cdt-libhover.patch b/eclipse-cdt-libhover.patch
new file mode 100644
index 0000000..1dcaec6
--- /dev/null
+++ b/eclipse-cdt-libhover.patch
@@ -0,0 +1,12 @@
+diff -up ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java
+--- ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java.fix	2012-04-24 18:03:48.000000000 -0400
++++ ./org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/cdt/libhover/LibhoverPlugin.java	2012-04-24 18:07:24.000000000 -0400
+@@ -44,7 +44,7 @@ public class LibhoverPlugin extends Abst
+ 	/**
+ 	 * The constructor
+ 	 */
+-	private LibhoverPlugin() {
++	public LibhoverPlugin() {
+ 	}
+ 
+ 	/*
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 44a27c2..fbfc82d 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -23,7 +23,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        0.5.junom6%{?dist}
+Release:        0.6.junom6%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -58,13 +58,8 @@ Patch0: %{name}-tycho-build.patch
 Patch1: %{name}-libhover-local-libstdcxx.patch
 Patch2: %{name}-libhover-libstdcxx.patch
 
-# Add LDFLAGS to Makefile for .so
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272364
-Patch3: %{name}-ppc64-add_ldflags.patch
-
-# Add define of _XOPEN_SOURCE so that ptsname header is included
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272370
-Patch4: %{name}-ppc64-add_xopen_source-include.patch
+# Fix problem with libhover in 0.10 having private constructor
+Patch3: %{name}-libhover.patch
 
 BuildRequires: tycho
 BuildRequires: tycho-extras
@@ -83,7 +78,7 @@ Requires:	objectweb-asm >= 3.2
 %if 0%{?rhel} >= 6
 ExclusiveArch: %{ix86} x86_64
 %else
-ExclusiveArch: %{ix86} x86_64 ppc ia64 ppc64
+ExclusiveArch: %{ix86} x86_64 ppc ia64 ppc64 %{arm}
 %endif
 
 %description
@@ -112,6 +107,22 @@ Source for Eclipse CDT for use within Eclipse.
 pushd %{cdt_snapshot}
 %patch0 -p1
 sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
+# Add arm support if we are building on arm
+%ifarch %{arm}
+pushd core
+cp -r org.eclipse.cdt.core.linux.x86 org.eclipse.cdt.core.linux.arm
+pushd org.eclipse.cdt.core.linux.arm
+sed -i -e 's/x86/arm/g' pom.xml
+pushd META-INF
+sed -i -e 's/x86/arm/g' MANIFEST.MF
+popd
+pushd os/linux
+mv x86 arm
+popd
+popd
+popd
+sed -i -e"/<module>core\/org.eclipse.cdt.core.linux<\/module>/ a\ \t\t<module>core\/org.eclipse.cdt.core.linux.arm<\/module>" pom.xml
+%endif
 popd
 
 ## Libhover stuff
@@ -122,6 +133,7 @@ rm -rf org.eclipse.linuxtools.cdt.libhover.newlib
 rm -rf org.eclipse.linuxtools.cdt.libhover.newlib-feature
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 pushd org.eclipse.linuxtools.cdt.libhover.libstdcxx
 mkdir data
 pushd data
@@ -130,20 +142,6 @@ popd
 popd
 popd
 
-%ifarch ppc64
-pushd org.eclipse.cdt.releng/results/plugins
-echo "fragmentName.linux.%{eclipse_arch} = C/C++ Development Tools Core for Linux (%{eclipse_arch})" \
-  >> org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core/plugin.properties
-cp -rp org.eclipse.cdt.core.linux.{x86,%{eclipse_arch}}
-cd org.eclipse.cdt.core.linux.%{eclipse_arch}
-sed -i "s/x86/%{eclipse_arch}/" META-INF/MANIFEST.MF
-mv os/linux/{x86,%{eclipse_arch}}
-cd ../org.eclipse.cdt.core.linux
-%patch3 -p0
-%patch4 -p0
-popd
-%endif
-
 %build
 export JAVA_HOME=%{java_home}
 
@@ -273,6 +271,10 @@ rm -rf $installDir/eclipse/binary
 %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
 
 %changelog
+* Mon Apr 23 2012 Jeff Johnston <jjohnstn at redhat.com> 1:8.1.0-0.6.junom6
+- Add arm build support.
+- Resolves: #815969 - Libhover not working for Juno M6 build 0.4.
+
 * Fri Apr 20 2012 Jeff Johnston <jjohnstn at redhat.com> 1:8.1.0-0.5.junom6
 - Remove P2 generation section that is no longer needed.
 - Add libhover.devhelp feature.