From 5343c529f07c306854117c047b7b081bdad632d3 Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Jan 04 2006 22:20:08 +0000
Subject: Use natively-compiled ecj during build.


---

diff --git a/eclipse.spec b/eclipse.spec
index 587bb7f..9f142bf 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -132,7 +132,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  mozilla = 37:1.7.12
 BuildRequires:  mozilla-devel = 37:1.7.12
 BuildRequires:  nspr-devel
-BuildRequires:  libXtst-devel
+BuildRequires:  xorg-x11-devel
 BuildRequires:  cairo >= 1.0
 %if %{gcj_support}
 BuildRequires:	gcc-java >= 4.0.2
@@ -557,35 +557,32 @@ ORIGCLASSPATH=$CLASSPATH
   # Delete our modified ecj and restore the backup
   rm -rf ecj-bootstrap-tmp
   
-  ## 1b. Natively-compile it
-  #gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
-  #  -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}
+  # 1b. Natively-compile it
+  gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
+    -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
+  # 2a. Build ecj
   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
 ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
 
 %if %{gcj_support}
-  ## 2b. Natively-compile ecj
-  #gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
-  #  -o jdtcoresrc/ecj.jar.so jdtcoresrc/ecj.jar
-  # 
-  # gcj-dbtool -n jdtcoresrc/ecj.db 30000
-  # 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
-  # rm ecj-bootstrap.db ecj-bootstrap.jar{,.so}
-  rm ecj-bootstrap.jar
+  # 2b. Natively-compile ecj
+  gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
+    -o jdtcoresrc/ecj.jar.so jdtcoresrc/ecj.jar
+   
+  gcj-dbtool -n jdtcoresrc/ecj.db 30000
+  gcj-dbtool -a jdtcoresrc/ecj.db jdtcoresrc/ecj.jar{,.so}
+   
+  # Remove our gcj-built ecj
+  rm ecj-bootstrap.db ecj-bootstrap.jar{,.so}
+
   # 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=blah"
+  export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/ecj.db"
 %endif
 
 # 3. Use this ecj to rebuild itself
@@ -593,16 +590,15 @@ export CLASSPATH=`pwd`/jdtcoresrc/ecj.jar:$ORIGCLASSPATH
 ant -buildfile jdtcoresrc/compilejdtcore.xml
 
 %if %{gcj_support}
-  ## Natively-compile it
-  #gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
-  #  -o ecj.jar.so ecj.jar
-  #gcj-dbtool -n ecj.db 30000
-  #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"
+  # Natively-compile it
+  gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
+    -o ecj.jar.so ecj.jar
+  gcj-dbtool -n ecj.db 30000
+  gcj-dbtool -a ecj.db ecj.jar{,.so}
+  export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj.db"
   
   # Remove old native bits
-  #rm jdtcoresrc/ecj.db jdtcoresrc/ecj.jar.so
+  rm jdtcoresrc/ecj.db jdtcoresrc/ecj.jar.so
 %endif
 
 # Build the rest of Eclipse
@@ -1268,6 +1264,10 @@ fi
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
 
 %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
 - Rebuild again.