commit java-1_8_0-openjdk for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package java-1_8_0-openjdk for openSUSE:Factory checked in at 2014-10-19 19:28:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_8_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_8_0-openjdk" Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/java-1_8_0-openjdk.changes 2014-10-05 20:32:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/java-1_8_0-openjdk.changes 2014-10-19 19:28:48.000000000 +0200 @@ -1,0 +2,28 @@ +Fri Oct 17 07:18:59 UTC 2014 - fstrba@suse.com + +- Upgrade to upstream tag jdk8u40-b10 + * Unstable snapshot in view of jdk8u40 release + * Contains security fixes from 14 october 2014 +- Add aarch64-jdk8u40-b09_b10.patch + * Manually upgrade the aarch64 hotspot tarball with the changes + between b09 and b10 + +------------------------------------------------------------------- +Thu Oct 16 20:07:56 UTC 2014 - fstrba@suse.com + +- Allow building for SLE11 + * Conditionalize BuildRequires + * Conditionalize cxxflags not understood by gcc 4.3 + * Conditionalize javadoc noarch build for distributions that + understand the per-package BuildArch +- Try to make the jre-32 and jre-64 provides more automatic +- Disable brp-check-bytecode-version during install + * java8 will have bytecode version 8 in its jars + +------------------------------------------------------------------- +Tue Oct 7 06:25:32 UTC 2014 - fstrba@suse.com + +- Force Zero VM for aarch64, since from the beginning we did not + manage to finish a build of Hotspot for this architecture. + +------------------------------------------------------------------- Old: ---- 0f0d70abca09.tar.bz2 304ea93428f8.tar.bz2 515a912fb5a9.tar.bz2 641eb6543c71.tar.bz2 68cf8e406ce5.tar.bz2 89551828b279.tar.bz2 8d4971881c66.tar.bz2 905a16825d29.tar.bz2 d3515520e68e.tar.bz2 New: ---- 076b1f38a5cc.tar.bz2 1053aeab6b12.tar.bz2 1b3abbeee961.tar.bz2 1f5248bc0714.tar.bz2 337fb10bc4da.tar.bz2 3ac6832f7901.tar.bz2 69b84370397f.tar.bz2 a6d92ff8b962.tar.bz2 aarch64-jdk8u40-b09_b10.patch c3a4729c70fa.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_8_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.jTuI6T/_old 2014-10-19 19:28:50.000000000 +0200 +++ /var/tmp/diff_new_pack.jTuI6T/_new 2014-10-19 19:28:50.000000000 +0200 @@ -16,9 +16,10 @@ # +%{!?aarch64:%global aarch64 aarch64 arm64 armv8} +%global jit_arches %ix86 x86_64 ppc64 ppc64le %global debug 0 %global bootcycle 1 -%global jit_arches %ix86 x86_64 aarch64 ppc64 ppc64le %global buildoutputdir build # Convert an absolute path to a relative path. Each symbolic link is # specified relative to the directory in which it is installed so that @@ -29,20 +30,20 @@ %global archname %{name} # Standard JPackage naming and versioning defines. %global updatever 40 -%global buildver b08 +%global buildver b10 %global root_project jdk8u %global root_repository jdk8u -%global root_revision 515a912fb5a9 -%global corba_revision 8d4971881c66 -%global hotspot_revision 905a16825d29 -%global jaxp_revision 641eb6543c71 -%global jaxws_revision 304ea93428f8 -%global jdk_revision 0f0d70abca09 -%global langtools_revision d3515520e68e -%global nashorn_revision 89551828b279 +%global root_revision 1053aeab6b12 +%global corba_revision a6d92ff8b962 +%global hotspot_revision 1b3abbeee961 +%global jaxp_revision 1f5248bc0714 +%global jaxws_revision 337fb10bc4da +%global jdk_revision c3a4729c70fa +%global langtools_revision 69b84370397f +%global nashorn_revision 076b1f38a5cc %global aarch64_project aarch64-port %global aarch64_repository jdk8 -%global aarch64_hotspot_revision 68cf8e406ce5 +%global aarch64_hotspot_revision 3ac6832f7901 %global icedtea_sound_version 1.0.1 # priority must be 6 digits in total %global priority 180%{updatever} @@ -63,7 +64,15 @@ %global cacerts %{_jvmdir}/%{jredir}/lib/security/cacerts # real file made by update-ca-certificates %global javacacerts %{_var}/lib/ca-certificates/java-cacerts -%{!?aarch64:%global aarch64 aarch64 arm64 armv8} +# turn zero on non jit arches by default +%ifnarch %{jit_arches} +%global _with_zero 1 +%endif +%if 0%{?suse_version} >= 1140 +%global with_pulseaudio 1 +%else +%global with_pulseaudio 0 +%endif %ifarch x86_64 %global archinstall amd64 %endif @@ -114,15 +123,31 @@ %global imagesdir images %global imagestarget images %endif -%ifarch %{jit_arches} +%ifnarch %{jit_arches} +%global _with_zero 1 +%endif +# bnc#542545 +# 32-bit versus 64-bit specific provides: +%ifarch %ix86 ppc s390 +%global bits 32 +%endif +%ifarch x86_64 ia64 s390x +%global bits 64 +%endif +%bcond_with zero +# Turn on/off some features depending on openSUSE version +%if 0%{?suse_version} >= 1130 +%if ! %{with zero} %global with_systemtap 1 %else %global with_systemtap 0 %endif -%if 0%{?suse_version} >= 1140 -%global with_pulseaudio 1 %else -%global with_pulseaudio 0 +%global with_systemtap 0 +%endif +%if %{with_systemtap} +%global tapsetroot %{_datadir}/systemtap +%global tapsetdir %{tapsetroot}/tapset/%{_build_cpu} %endif %if %{with_systemtap} # Where to install systemtap tapset (links) @@ -169,6 +194,8 @@ Source100: config.guess Source101: config.sub # RPM/distribution specific patches +# Bring the aarch64 hotspot tarball from b09 to b10 manually +Patch1: aarch64-jdk8u40-b09_b10.patch # RHBZ 1015432 Patch2: 1015432.patch # Restrict access to java-atk-wrapper classes @@ -217,15 +244,10 @@ BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: fontconfig -BuildRequires: freetype-devel +BuildRequires: freetype2-devel BuildRequires: gcc-c++ BuildRequires: giflib-devel BuildRequires: gtk2-devel -BuildRequires: libX11-devel -BuildRequires: libXi-devel -BuildRequires: libXinerama-devel -BuildRequires: libXt-devel -BuildRequires: libXtst-devel BuildRequires: libjpeg-devel BuildRequires: liblcms2-devel BuildRequires: libpng-devel @@ -254,22 +276,39 @@ Provides: jre-openjdk = %{version}-%{release} # Standard JPackage extensions provides. Provides: java-fonts = %{version} +# Required at least by fop +Provides: java-%{bits} = %{javaver} +Provides: java-%{javaver}-%{bits} +Provides: java-openjdk-%{bits} = %{version}-%{release} +Provides: jre-%{bits} = %{javaver} +Provides: jre-%{javaver}-%{bits} +Provides: jre-%{javaver}-openjdk-%{bits} = %{version}-%{release} +Provides: jre-openjdk-%{bits} = %{version}-%{release} +Provides: jre1.3.x +Provides: jre1.4.x +Provides: jre1.5.x +Provides: jre1.6.x +Provides: jre1.7.x +Provides: jre1.8.x BuildRoot: %{_tmppath}/%{name}-%{version}-build -%ifarch %ix86 ppc -Provides: jre-32 = %{javaver} +# Zero-assembler build requirement. +%if %{with zero} +BuildRequires: libffi-devel %endif -%ifarch x86_64 -Provides: jre-64 = %{javaver} +%if 0%{?suse_version} <= 1130 +BuildRequires: xorg-x11-devel +%else +BuildRequires: libX11-devel +BuildRequires: libXi-devel +BuildRequires: libXinerama-devel +BuildRequires: libXt-devel +BuildRequires: libXtst-devel %endif %if %{bootcycle} BuildRequires: java-bootstrap-devel >= 1.6.0 %else BuildRequires: java-devel >= %{javaver} %endif -# Zero-assembler build requirement. -%ifnarch %{jit_arches} -BuildRequires: libffi-devel -%endif # runtime certificates generation available in 11.3+ - bnc#596177 %if 0%{?suse_version} >= 1130 BuildRequires: java-ca-certificates @@ -375,7 +414,9 @@ # Standard JPackage javadoc provides. Provides: java-%{javaver}-javadoc = %{version}-%{release} Provides: java-javadoc = %{version}-%{release} +%if 0%{?suse_version} >= 1120 BuildArch: noarch +%endif %description javadoc The OpenJDK API documentation. @@ -454,6 +495,9 @@ %patch204 -p1 %patch205 -p1 +%ifarch %{aarch64} +%patch1 +%endif %patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -542,7 +586,7 @@ pushd %{buildoutputdir} bash ../configure \ -%ifnarch %{jit_arches} +%if %{with zero} --with-jvm-variants=zero \ %endif --disable-zip-debug-info \ @@ -560,8 +604,11 @@ %ifnarch %{arm} --with-num-cores="$NUM_PROC" \ %endif +%if 0%{?suse_version} >= 1120 --with-extra-cflags="-fno-devirtualize" \ - --with-extra-cxxflags="-fno-devirtualize" + --with-extra-cxxflags="-fno-devirtualize" \ +%endif + --with-boot-jdk=%{_sysconfdir}/alternatives/java_sdk # The combination of FULL_DEBUG_SYMBOLS=0 and ALT_OBJCOPY=/does_not_exist # disables FDS for all build configs and reverts to pre-FDS make logic. @@ -641,7 +688,11 @@ fi %install -STRIP_KEEP_SYMTAB=libjvm* +export LANG=en_US.UTF-8 +#bnc#530046 +export STRIP_KEEP_SYMTAB=libjvm* +# skip /usr/lib/rpm/brp-check-bytecode-version: +export NO_BRP_CHECK_BYTECODE_VERSION=true %if %{with_systemtap} # Install systemtap support files. ++++++ 0f0d70abca09.tar.bz2 -> 076b1f38a5cc.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/0f0d70abca09.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/076b1f38a5cc.tar.bz2 differ: char 11, line 1 ++++++ 0f0d70abca09.tar.bz2 -> 1053aeab6b12.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/0f0d70abca09.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/1053aeab6b12.tar.bz2 differ: char 11, line 1 ++++++ 0f0d70abca09.tar.bz2 -> 1b3abbeee961.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/0f0d70abca09.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/1b3abbeee961.tar.bz2 differ: char 11, line 1 ++++++ 0f0d70abca09.tar.bz2 -> 1f5248bc0714.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/0f0d70abca09.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/1f5248bc0714.tar.bz2 differ: char 11, line 1 ++++++ 0f0d70abca09.tar.bz2 -> 337fb10bc4da.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/0f0d70abca09.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/337fb10bc4da.tar.bz2 differ: char 11, line 1 ++++++ 0f0d70abca09.tar.bz2 -> 3ac6832f7901.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/0f0d70abca09.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/3ac6832f7901.tar.bz2 differ: char 11, line 1 ++++++ 0f0d70abca09.tar.bz2 -> 69b84370397f.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/0f0d70abca09.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/69b84370397f.tar.bz2 differ: char 11, line 1 ++++++ 0f0d70abca09.tar.bz2 -> a6d92ff8b962.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/0f0d70abca09.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/a6d92ff8b962.tar.bz2 differ: char 11, line 1 ++++++ aarch64-jdk8u40-b09_b10.patch ++++++ ++++ 1371 lines (skipped) ++++++ aarch64-misc.patch ++++++ --- /var/tmp/diff_new_pack.jTuI6T/_old 2014-10-19 19:28:50.000000000 +0200 +++ /var/tmp/diff_new_pack.jTuI6T/_new 2014-10-19 19:28:50.000000000 +0200 @@ -1,18 +1,6 @@ --- jdk8/common/autoconf/jdk-options.m4 2014-06-18 21:34:07.000000000 +0200 +++ jdk8/common/autoconf/jdk-options.m4 2014-07-09 16:03:01.156813855 +0200 -@@ -117,11 +117,6 @@ - JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'` - JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'` - -- if test "x$JVM_VARIANT_CLIENT" = xtrue; then -- if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then -- AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.]) -- fi -- fi - if test "x$JVM_VARIANT_KERNEL" = xtrue; then - if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then - AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.]) -@@ -161,6 +156,9 @@ +@@ -161,6 +161,9 @@ if test "x$VAR_CPU" = xppc64 ; then INCLUDE_SA=false fi ++++++ 0f0d70abca09.tar.bz2 -> c3a4729c70fa.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/0f0d70abca09.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/c3a4729c70fa.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de