From 8a4a75545ef167a59c861c4a08c9bd16e3f62a58b91a4dc0c84c39c0fcc24d3e Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 29 Sep 2014 06:39:34 +0000
Subject: [PATCH] template jvm interpreter for ppc64le + reformat with spec
 cleaner

OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=17
---
 java-1_8_0-openjdk.changes |  7 +++++++
 java-1_8_0-openjdk.spec    | 31 ++++++++++++++++++++-----------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index 77934ce..5e84a0c 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Sep 29 06:36:58 UTC 2014 - fstrba@suse.com
+
+- Build template jvm interpreter on ppc64le
+  * It was ported for this architecture in jdk8u49-b06
+- Reformat the spec file with spec-cleaner
+
 -------------------------------------------------------------------
 Fri Sep 26 07:35:47 UTC 2014 - fstrba@suse.com
 
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index aee535a..6b706a5 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -63,6 +63,7 @@
 %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}
 %ifarch x86_64
 %global archinstall amd64
 %endif
@@ -248,19 +249,18 @@ Provides:       java = %{javaver}
 Provides:       java-%{javaver} = %{version}-%{release}
 Provides:       java-openjdk = %{version}-%{release}
 Provides:       jre = %{javaver}
-%ifarch %{ix86} ppc
-Provides:       jre-32 = %{javaver}
-%endif
-%ifarch x86_64
-Provides:       jre-64 = %{javaver}
-%endif
 Provides:       jre-%{javaver} = %{version}-%{release}
 Provides:       jre-%{javaver}-openjdk = %{version}-%{release}
 Provides:       jre-openjdk = %{version}-%{release}
 # Standard JPackage extensions provides.
 Provides:       java-fonts = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
+%ifarch %ix86 ppc
+Provides:       jre-32 = %{javaver}
+%endif
+%ifarch x86_64
+Provides:       jre-64 = %{javaver}
+%endif
 %if %{bootcycle}
 BuildRequires:  java-devel >= 1.6.0
 %else
@@ -409,6 +409,7 @@ need to.
 %setup -q -D -n %{root_repository}-%{root_revision} -T -a 5
 %setup -q -D -n %{root_repository}-%{root_revision} -T -a 6
 %setup -q -D -n %{root_repository}-%{root_revision} -T -a 7
+
 %if %{with_pulseaudio}
 %setup -q -D -n %{root_repository}-%{root_revision} -T -a 9
 %endif
@@ -416,6 +417,7 @@ need to.
 # Set up the build tree using the subrepository tarballs
 pwd
 mv corba-%{corba_revision} corba
+
 %ifarch %{aarch64}
 mv hotspot-%{aarch64_hotspot_revision} hotspot
 %else
@@ -426,6 +428,7 @@ mv jaxws-%{jaxws_revision} jaxws
 mv jdk-%{jdk_revision} jdk
 mv langtools-%{langtools_revision} langtools
 mv nashorn-%{nashorn_revision} nashorn
+
 %if %{with_pulseaudio}
 mv icedtea-sound-%{icedtea_sound_version} icedtea-sound
 %endif
@@ -467,6 +470,7 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
 %patch99 -p1
 
 # s390 build fixes
+
 %ifarch s390
 %patch100 -p1
 %patch101 -p1
@@ -478,6 +482,7 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
 %endif
 
 # Extract systemtap tapsets
+
 %if %{with_systemtap}
 
 tar xzf %{SOURCE10}
@@ -487,6 +492,7 @@ for file in tapset/*.in; do
     OUTPUT_FILE=`echo $file | sed -e s:\.in$::g`
     sed -e s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{jredir}/lib/%{archinstall}/server/libjvm.so:g $file > $file.1
 # TODO find out which architectures other than ix86 have a client vm
+
 %ifarch %ix86
     sed -e s:@ABS_CLIENT_LIBJVM_SO@:%{_jvmdir}/%{jredir}/lib/%{archinstall}/client/libjvm.so:g $file.1 > $OUTPUT_FILE
 %else
@@ -518,9 +524,11 @@ export ZLIB_LIBS="-L/%{_lib} -lz"
 %endif
 
 # Build IcedTea and OpenJDK.
+
 %ifarch s390x sparc64 alpha ppc64 ppc64le %{aarch64}
 export ARCH_DATA_MODEL=64
 %endif
+
 %ifarch alpha
 export CFLAGS="$CFLAGS -mieee"
 %endif
@@ -534,6 +542,7 @@ mkdir -p %{buildoutputdir}
 pushd %{buildoutputdir}
 
 bash ../configure \
+
 %ifnarch %{jit_arches}
     --with-jvm-variants=zero \
 %endif
@@ -549,11 +558,9 @@ bash ../configure \
     --with-libpng=system \
     --with-lcms=system \
     --with-stdc++lib=dynamic \
+
 %ifnarch %{arm}
     --with-num-cores="$NUM_PROC" \
-%endif
-%ifarch ppc64le
-    --with-jvm-interpreter=cpp \
 %endif
     --with-extra-cflags="-fno-devirtualize" \
     --with-extra-cxxflags="-fno-devirtualize"
@@ -585,6 +592,7 @@ export JAVA_HOME=$(pwd)/%{buildoutputdir}/%{imagesdir}/j2sdk-image
 if [ -f %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/lib/security/cacerts ]; then
         rm %{buildoutputdir}/%{imagesdir}/j2sdk-image/jre/lib/security/cacerts
 fi
+
 %if 0%{?suse_version} < 1130
 # ========== a default keystore ==========
 # a cacerts generation - 11.3+ use java-ca-certificates package
@@ -883,7 +891,6 @@ then
 fi
 
 %if 0%{?suse_version} >= 1130
-
 %posttrans headless
 # bnc#781690#c11: don't trust user defined JAVA_HOME and use the current VM
 # XXX: this might conflict between various versions of openjdk
@@ -1112,6 +1119,7 @@ fi
 %{_jvmdir}/%{sdkdir}/bin/*
 %{_jvmdir}/%{sdkdir}/include/*
 %{_jvmdir}/%{sdkdir}/lib/*
+
 %if %{with_systemtap}
 %{_jvmdir}/%{sdkdir}/tapset/*.stp
 %endif
@@ -1147,6 +1155,7 @@ fi
 %{_mandir}/man1/wsgen-%{sdklnk}.1*
 %{_mandir}/man1/wsimport-%{sdklnk}.1*
 %{_mandir}/man1/xjc-%{sdklnk}.1*
+
 %if %{with_systemtap}
 %{tapsetroot}
 %endif