rpms
/
eclipse
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reenable bootstrap (for the purpose of arm build). 

Fix the launcher build for arm.
Fix the s390 build issue.
This commit is contained in:
Krzysztof Daniel 2013-01-04 11:17:33 +01:00
parent 135a65f240
commit 2f7c6ac5e5
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eclipse-secondary-arches.patch
View File

@ -282,7 +282,7 @@
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse_cbi" />
+ <ant antfile="build.xml" dir="library/gtk/" />
+ </target>
+ </configuration>
+ <goals>
@ -336,7 +336,7 @@
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse_cbi" />
+ <ant antfile="build.xml" dir="library/gtk/" />
+ </target>
+ </configuration>
+ <goals>
@ -391,7 +391,7 @@
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse_cbi" />
+ <ant antfile="build.xml" dir="library/gtk/" />
+ </target>
+ </configuration>
+ <goals>
@ -435,7 +435,7 @@
defaultJava=DEFAULT_JAVA_EXEC
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
+ "armv*")
+ armv*)
+ defaultOSArch="arm"
+ defaultJava=DEFAULT_JAVA_EXEC
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"

10
eclipse.spec
View File

@ -28,7 +28,7 @@ Epoch: 1
# Set this flag to 1 if you want to build Eclipse without dependency to eclipse-pde
# Some parts (help) will not be built, and second run will be required, but this
# is a way to bootstrap Eclipse on secondary archs.
%global bootstrap 0
%global bootstrap 1
# FIXME: update java packaging guidelines for this. See
# fedora-devel-java-list discussion in September 2008.
@ -65,7 +65,7 @@ fi;
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_version}
Release: 0.1.git20121217%{?dist}
Release: 0.2.git20121217%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@ -546,6 +546,7 @@ sed -i -e "s/1500/1503/" rt.equinox.framework/bundles/org.eclipse.equinox.launch
#hack - there should be a patch providing a profile for each arch
mkdir -p rt.equinox.framework/bundles/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch}
mkdir -p rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch}
sed -i -e "s/org.apache.jasper.glassfish/org.glassfish.web.javax.servlet.jsp/" eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
sed -i -e "s/javax.annotation/org.apache.geronimo.specs.geronimo-annotation_1.1_spec/" eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
@ -1349,6 +1350,11 @@ rm -rf %{_bindir}/efj/
%{_mavendepmapfragdir}/%{name}-equinox-osgi
%changelog
* Wed Jan 2 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.2-0.2.git20121217
- Enable bootstrap (for the purpose of arm build).
- Fix the launcher build for arm.
- Fix the s390 build issue.
* Fri Dec 21 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.2-0.1.git20121217
- Update to pre SR2.