Mailinglist Archive: opensuse-commit (1670 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package java-1_4_2-gcj-compat
checked in at Mon Oct 9 18:21:47 CEST 2006.

--------
--- java-1_4_2-gcj-compat/java-1_4_2-gcj-compat.changes	2006-10-02 12:06:24.000000000 +0200
+++ /mounts/work_src_done/STABLE/java-1_4_2-gcj-compat/java-1_4_2-gcj-compat.changes	2006-10-05 18:01:31.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Oct  5 18:01:19 CEST 2006 - dbornkessel@xxxxxxx
+
+- make sure glibj is used when compiling 
+
+-------------------------------------------------------------------

New:
----
  bootclasspath.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ java-1_4_2-gcj-compat.spec ++++++
--- /var/tmp/diff_new_pack.Sq5m6n/_old	2006-10-09 18:21:29.000000000 +0200
+++ /var/tmp/diff_new_pack.Sq5m6n/_new	2006-10-09 18:21:29.000000000 +0200
@@ -27,7 +27,7 @@
 %define _jvmjardir %{_libdir}/jvm-exports
 %endif
 Version:        1.4.2.0
-Release:        42
+Release:        43
 %define section		free
 %define gccsuffix	%{nil}
 %define	origin		gcj%{gccsuffix}
@@ -51,6 +51,7 @@
 Source0:        java-gcj-compat-%{jgcver}.tar.bz2
 # Call gij instead of gcj in the "java" wrapper script:
 Patch0:         java.in.diff
+Patch1:         bootclasspath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # gcc-java should not be required, see Suse Bugzilla bug #151732
 # even if it would be required it should have been a PreReq
@@ -143,8 +144,8 @@
 
 %prep
 %setup -q -n java-gcj-compat-%{jgcver}
-# Call gij instead of gcj in the "java" wrapper script:
-#%patch0
+%patch1 -p1
+sed -i -e 's|@GLIBJ_JAR@|%{_jvmdir}/%{jredir}/lib/|g' com/sun/tools/javac/Config.java.in
 
 %build
 %configure --disable-symlinks --with-gcc-suffix=%{gccsuffix} --with-jvm-root-dir=%{_jvmdir} --with-java-home=%{_jvmdir}
@@ -156,6 +157,7 @@
 install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{cname}-%{version}/jre/lib
 # make a link to ecj.jar in the lib dir:
 ln -sf %{_javadir}/jdtcore.jar $RPM_BUILD_ROOT%{_jvmdir}/%{cname}-%{version}/jre/lib
+ln -sf %{_javadir}/glibj.jar $RPM_BUILD_ROOT%{_jvmdir}/%{cname}-%{version}/jre/lib/rt.jar
 install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{cname}-%{version}/include
 # create dummy versions of these files so that this rpm can own them
 #touch $RPM_BUILD_ROOT%{_jvmdir}/%{cname}-%{version}/jre/lib/rt.jar
@@ -330,6 +332,8 @@
 #%ghost %{_jvmdir}/%{cname}-%{version}/include/jni.h
 
 %changelog -n java-1_4_2-gcj-compat
+* Thu Oct 05 2006 - dbornkessel@xxxxxxx
+- make sure glibj is used when compiling
 * Mon Oct 02 2006 - dbornkessel@xxxxxxx
 - added fastjar Require to devel package
 * Mon Oct 02 2006 - dbornkessel@xxxxxxx

++++++ bootclasspath.patch ++++++
Index: java-gcj-compat-1.0.61/com/sun/tools/javac/Main.java
===================================================================
--- java-gcj-compat-1.0.61.orig/com/sun/tools/javac/Main.java
+++ java-gcj-compat-1.0.61/com/sun/tools/javac/Main.java
@@ -138,6 +138,7 @@ public class Main
 
   public static void main (String[] args) throws Exception
   {
+    System.setProperty("java.ext.dirs", new String(  (System.getProperty("java.ext.dirs") != null ? System.getProperty("java.ext.dirs")+ ":" : "")  + Config.GLIBJ_JAR));
     Runtime.getRuntime ().exit (Main.compile (args));
   }
 }
Index: java-gcj-compat-1.0.61/com/sun/tools/javac/Config.java.in
===================================================================
--- java-gcj-compat-1.0.61.orig/com/sun/tools/javac/Config.java.in
+++ java-gcj-compat-1.0.61/com/sun/tools/javac/Config.java.in
@@ -47,4 +47,5 @@ public interface Config
    * The directory where required jars are installed.
    */
   String JAR_INST_DIR = "@JAR_INST_DIR@";
+  String GLIBJ_JAR = "@GLIBJ_JAR@";
 }

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx