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

Use natively-compiled ecj during build.

Browse Source
This commit is contained in:
Andrew Overholt 2006-01-04 22:20:08 +00:00
parent 9ab28661dd
commit f3d35a6358
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
eclipse.spec
View File

@ -132,7 +132,7 @@ BuildRequires: gcc-c++
BuildRequires: mozilla = 37:1.7.12 BuildRequires: mozilla = 37:1.7.12
BuildRequires: mozilla-devel = 37:1.7.12 BuildRequires: mozilla-devel = 37:1.7.12
BuildRequires: nspr-devel BuildRequires: nspr-devel
BuildRequires: libXtst-devel BuildRequires: xorg-x11-devel
BuildRequires: cairo >= 1.0 BuildRequires: cairo >= 1.0
%if %{gcj_support} %if %{gcj_support}
BuildRequires: gcc-java >= 4.0.2 BuildRequires: gcc-java >= 4.0.2
@ -557,35 +557,32 @@ ORIGCLASSPATH=$CLASSPATH
# Delete our modified ecj and restore the backup # Delete our modified ecj and restore the backup
rm -rf ecj-bootstrap-tmp rm -rf ecj-bootstrap-tmp
## 1b. Natively-compile it # 1b. Natively-compile it
#gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \ gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
# -o ecj-bootstrap.jar.so ecj-bootstrap.jar -o ecj-bootstrap.jar.so ecj-bootstrap.jar
#
#gcj-dbtool -n ecj-bootstrap.db 30000
#gcj-dbtool -a ecj-bootstrap.db ecj-bootstrap.jar{,.so}
## 2a. Build ecj gcj-dbtool -n ecj-bootstrap.db 30000
gcj-dbtool -a ecj-bootstrap.db ecj-bootstrap.jar{,.so}
# 2a. Build ecj
export CLASSPATH=ecj-bootstrap.jar:$ORIGCLASSPATH export CLASSPATH=ecj-bootstrap.jar:$ORIGCLASSPATH
#export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/ecj-bootstrap.db" export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj-bootstrap.db"
#export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj-bootstrap.db"
%endif %endif
ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
%if %{gcj_support} %if %{gcj_support}
## 2b. Natively-compile ecj # 2b. Natively-compile ecj
#gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \ gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
# -o jdtcoresrc/ecj.jar.so jdtcoresrc/ecj.jar -o jdtcoresrc/ecj.jar.so jdtcoresrc/ecj.jar
#
# gcj-dbtool -n jdtcoresrc/ecj.db 30000 gcj-dbtool -n jdtcoresrc/ecj.db 30000
# gcj-dbtool -a jdtcoresrc/ecj.db jdtcoresrc/ecj.jar{,.so} gcj-dbtool -a jdtcoresrc/ecj.db jdtcoresrc/ecj.jar{,.so}
# export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/ecj.db"
# # Remove our gcj-built ecj
# # Remove our gcj-built ecj rm ecj-bootstrap.db ecj-bootstrap.jar{,.so}
# rm ecj-bootstrap.db ecj-bootstrap.jar{,.so}
rm ecj-bootstrap.jar
# To enSURE we're not using any pre-compiled ecj on the build system, set this # To enSURE we're not using any pre-compiled ecj on the build system, set this
#export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/ecj.db" export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/ecj.db"
export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=blah"
%endif %endif
# 3. Use this ecj to rebuild itself # 3. Use this ecj to rebuild itself
@ -593,16 +590,15 @@ export CLASSPATH=`pwd`/jdtcoresrc/ecj.jar:$ORIGCLASSPATH
ant -buildfile jdtcoresrc/compilejdtcore.xml ant -buildfile jdtcoresrc/compilejdtcore.xml
%if %{gcj_support} %if %{gcj_support}
## Natively-compile it # Natively-compile it
#gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \ gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
# -o ecj.jar.so ecj.jar -o ecj.jar.so ecj.jar
#gcj-dbtool -n ecj.db 30000 gcj-dbtool -n ecj.db 30000
#gcj-dbtool -a ecj.db ecj.jar{,.so} gcj-dbtool -a ecj.db ecj.jar{,.so}
#export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/ecj.db" export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj.db"
#export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj.db"
# Remove old native bits # Remove old native bits
#rm jdtcoresrc/ecj.db jdtcoresrc/ecj.jar.so rm jdtcoresrc/ecj.db jdtcoresrc/ecj.jar.so
%endif %endif
# Build the rest of Eclipse # Build the rest of Eclipse
@ -1268,6 +1264,10 @@ fi
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
%changelog %changelog
* Wed Jan 04 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_14fc
- Update s390{,x} patches.
- Use natively-compiled ecj during build.
* Fri Dec 23 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_14fc * Fri Dec 23 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_14fc
- Rebuild again. - Rebuild again.