Reenable bootstrap (for the purpose of arm build).
Fix the launcher build for arm. Fix the s390 build issue.
This commit is contained in:
parent
135a65f240
commit
2f7c6ac5e5
|
@ -282,7 +282,7 @@
|
||||||
+ <phase>generate-resources</phase>
|
+ <phase>generate-resources</phase>
|
||||||
+ <configuration>
|
+ <configuration>
|
||||||
+ <target>
|
+ <target>
|
||||||
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse_cbi" />
|
+ <ant antfile="build.xml" dir="library/gtk/" />
|
||||||
+ </target>
|
+ </target>
|
||||||
+ </configuration>
|
+ </configuration>
|
||||||
+ <goals>
|
+ <goals>
|
||||||
|
@ -336,7 +336,7 @@
|
||||||
+ <phase>generate-resources</phase>
|
+ <phase>generate-resources</phase>
|
||||||
+ <configuration>
|
+ <configuration>
|
||||||
+ <target>
|
+ <target>
|
||||||
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse_cbi" />
|
+ <ant antfile="build.xml" dir="library/gtk/" />
|
||||||
+ </target>
|
+ </target>
|
||||||
+ </configuration>
|
+ </configuration>
|
||||||
+ <goals>
|
+ <goals>
|
||||||
|
@ -391,7 +391,7 @@
|
||||||
+ <phase>generate-resources</phase>
|
+ <phase>generate-resources</phase>
|
||||||
+ <configuration>
|
+ <configuration>
|
||||||
+ <target>
|
+ <target>
|
||||||
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse_cbi" />
|
+ <ant antfile="build.xml" dir="library/gtk/" />
|
||||||
+ </target>
|
+ </target>
|
||||||
+ </configuration>
|
+ </configuration>
|
||||||
+ <goals>
|
+ <goals>
|
||||||
|
@ -435,7 +435,7 @@
|
||||||
defaultJava=DEFAULT_JAVA_EXEC
|
defaultJava=DEFAULT_JAVA_EXEC
|
||||||
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
||||||
;;
|
;;
|
||||||
+ "armv*")
|
+ armv*)
|
||||||
+ defaultOSArch="arm"
|
+ defaultOSArch="arm"
|
||||||
+ defaultJava=DEFAULT_JAVA_EXEC
|
+ defaultJava=DEFAULT_JAVA_EXEC
|
||||||
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
||||||
|
|
10
eclipse.spec
10
eclipse.spec
|
@ -28,7 +28,7 @@ Epoch: 1
|
||||||
# Set this flag to 1 if you want to build Eclipse without dependency to eclipse-pde
|
# 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
|
# Some parts (help) will not be built, and second run will be required, but this
|
||||||
# is a way to bootstrap Eclipse on secondary archs.
|
# is a way to bootstrap Eclipse on secondary archs.
|
||||||
%global bootstrap 0
|
%global bootstrap 1
|
||||||
|
|
||||||
# FIXME: update java packaging guidelines for this. See
|
# FIXME: update java packaging guidelines for this. See
|
||||||
# fedora-devel-java-list discussion in September 2008.
|
# fedora-devel-java-list discussion in September 2008.
|
||||||
|
@ -65,7 +65,7 @@ fi;
|
||||||
Summary: An open, extensible IDE
|
Summary: An open, extensible IDE
|
||||||
Name: eclipse
|
Name: eclipse
|
||||||
Version: %{eclipse_version}
|
Version: %{eclipse_version}
|
||||||
Release: 0.1.git20121217%{?dist}
|
Release: 0.2.git20121217%{?dist}
|
||||||
License: EPL
|
License: EPL
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
URL: http://www.eclipse.org/
|
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
|
#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.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/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
|
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
|
%{_mavendepmapfragdir}/%{name}-equinox-osgi
|
||||||
|
|
||||||
%changelog
|
%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
|
* Fri Dec 21 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.2-0.1.git20121217
|
||||||
- Update to pre SR2.
|
- Update to pre SR2.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue