Hello community,
here is the log from the commit of package java-1_7_0-openjdk for
openSUSE:Factory checked in at 2014-10-23 14:19:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk"
Changes:
--------
---
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk-bootstrap.changes
2014-10-17 08:50:31.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes
2014-10-23 14:19:55.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Oct 16 19:54:13 UTC 2014 - [email protected]
+
+- Try to make the jre-32 and jre-64 provides more automatic
+
+-------------------------------------------------------------------
+Thu Oct 16 09:40:31 UTC 2014 - [email protected]
+
+- Add java-1_7_0-openjdk-override.patch
+ * Trying to fix boostrap build with gcc 4.3
+
+-------------------------------------------------------------------
java-1_7_0-openjdk.changes: same change
New:
----
java-1_7_0-openjdk-override.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.5zYDkm/_old 2014-10-23 14:19:57.000000000 +0200
+++ /var/tmp/diff_new_pack.5zYDkm/_new 2014-10-23 14:19:57.000000000 +0200
@@ -95,9 +95,6 @@
%ifarch x86_64 ia64 s390x
%global bits 64
%endif
-%if 0%{?__isa_bits:1}
-%global bits %{__isa_bits}
-%endif
%bcond_without bootstrap
%bcond_with zero
# Turn on/off some features depending on openSUSE version
@@ -185,6 +182,7 @@
Patch1004: java-1_7_0-openjdk-zero-annotate-aborting-functions-zero.patch
# Avoid too much silence from javadoc
Patch1005: java-1_7_0-openjdk-javadoc-verbose.patch
+Patch1006: java-1_7_0-openjdk-override.patch
Patch10011: openjdk-7-src-b147-no-return-in-nonvoid-hotspot.patch
BuildRequires: alsa-lib-devel
#BuildRequires: xalan-j2
@@ -266,12 +264,6 @@
Provides: jre1.5.x
Provides: jre1.6.x
Provides: jre1.7.x
-%ifarch %ix86 ppc
-Provides: jre-32 = %{javaver}
-%endif
-%ifarch x86_64
-Provides: jre-64 = %{javaver}
-%endif
%else
Provides: java-bootstrap = %{javaver}
%endif
@@ -520,10 +512,8 @@
%configure \
%if %{with bootstrap}
--enable-bootstrap \
- --with-gcj \
+ --enable-bootstrap-tools \
--with-javac=${JAVAC} \
- --with-ecj=%{_bindir}/ecj \
- --with-ecj-jar=${ECJJAR} \
--disable-docs \
%else
--disable-bootstrap \
@@ -604,6 +594,10 @@
patch -p1 -i %{PATCH10011}
%endif
+%if %{with bootstrap}
+patch -p0 -i %{PATCH1006}
+%endif
+
make %{?_smp_mflags}
export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
++++++ java-1_7_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.5zYDkm/_old 2014-10-23 14:19:57.000000000 +0200
+++ /var/tmp/diff_new_pack.5zYDkm/_new 2014-10-23 14:19:57.000000000 +0200
@@ -95,9 +95,6 @@
%ifarch x86_64 ia64 s390x
%global bits 64
%endif
-%if 0%{?__isa_bits:1}
-%global bits %{__isa_bits}
-%endif
%bcond_with bootstrap
%bcond_with zero
# Turn on/off some features depending on openSUSE version
@@ -185,6 +182,7 @@
Patch1004: java-1_7_0-openjdk-zero-annotate-aborting-functions-zero.patch
# Avoid too much silence from javadoc
Patch1005: java-1_7_0-openjdk-javadoc-verbose.patch
+Patch1006: java-1_7_0-openjdk-override.patch
Patch10011: openjdk-7-src-b147-no-return-in-nonvoid-hotspot.patch
BuildRequires: alsa-lib-devel
#BuildRequires: xalan-j2
@@ -266,12 +264,6 @@
Provides: jre1.5.x
Provides: jre1.6.x
Provides: jre1.7.x
-%ifarch %ix86 ppc
-Provides: jre-32 = %{javaver}
-%endif
-%ifarch x86_64
-Provides: jre-64 = %{javaver}
-%endif
%else
Provides: java-bootstrap = %{javaver}
%endif
@@ -520,10 +512,8 @@
%configure \
%if %{with bootstrap}
--enable-bootstrap \
- --with-gcj \
+ --enable-bootstrap-tools \
--with-javac=${JAVAC} \
- --with-ecj=%{_bindir}/ecj \
- --with-ecj-jar=${ECJJAR} \
--disable-docs \
%else
--disable-bootstrap \
@@ -604,6 +594,10 @@
patch -p1 -i %{PATCH10011}
%endif
+%if %{with bootstrap}
+patch -p0 -i %{PATCH1006}
+%endif
+
make %{?_smp_mflags}
export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
++++++ java-1_7_0-openjdk-override.patch ++++++
---
openjdk/jdk/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java
2014-10-16 11:21:12.169855907 +0200
+++
openjdk/jdk/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java
2014-10-16 11:13:35.377248000 +0200
@@ -44,9 +44,7 @@
boolean matches(ReferenceType refType);
ClassPrepareRequest createPrepareRequest();
- @Override
int hashCode();
- @Override
boolean equals(Object obj);
}
---
openjdk/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java
2014-10-16 11:21:12.169855907 +0200
+++
openjdk/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java
2014-10-16 11:13:35.377248000 +0200
@@ -42,9 +42,7 @@
*/
boolean matches(ReferenceType refType);
- @Override
int hashCode();
- @Override
boolean equals(Object obj);
}
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
