X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenjdk8.git;a=blobdiff_plain;f=openjdk8.spec;h=75fd0ed1abc5a7610f88d2095e42c1667bb85ea5;hp=88b01f23cab9d931bf0ba8d8311e86b7ffcd7ba4;hb=a1d2ff9b87f97375d91865931bdf50f1b19e4fef;hpb=665079f5b90c385f14d6a9b1575d0b5d12461d4f

diff --git a/openjdk8.spec b/openjdk8.spec
index 88b01f2..75fd0ed 100644
--- a/openjdk8.spec
+++ b/openjdk8.spec
@@ -1,9 +1,12 @@
 #
+# NOTE:	versioning and release status might not be clear
+#	http://openjdk.java.net/projects/jdk8u/ gives some information
+#	about current status of the 'updates'
+#
 # TODO:
 #	- use other system libs (libsctp?)
-#	- build alternative VM for x32
 #	- include icedtea-sound?
-#	- port PLD-specific changes from icedtea7?
+#	- consider zeroshark (LLVM-based JIT) for x32
 
 %bcond_with bootstrap   # build a bootstrap version, using icedtea6
 %bcond_without cacerts	# don't include the default CA certificates
@@ -19,31 +22,31 @@
 # JDK/JRE version, as returned with `java -version`, '_' replaced with '.'
 %define		_jdkversion 1.8.0.internal
 
-%define	ver_u	66
-%define	ver_b	02
+%define	ver_u	72
+%define	ver_b	15
 Summary:	Open-source implementation of the Java Platform, Standard Edition
 Summary(pl.UTF-8):	Wolnoźródłowa implementacja Java 8 SE
 Name:		openjdk8
 Version:	8u%{ver_u}.b%{ver_b}
-Release:	0.1
+Release:	1
 License:	GPL v2
 Group:		Development/Languages/Java
 Source0:	%{name}-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
-# Source0-md5:	1d115662e175470270e89a4da8e0fce2
+# Source0-md5:	161dfcff6fbf49649b35c86fa5bbc2b4
 Source1:	%{name}-corba-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
-# Source1-md5:	e14d8f51b9ca30d798094a2867f3f5d0
+# Source1-md5:	c822b9ac498d5bfbaa82ce6fa1c126a4
 Source2:	%{name}-hotspot-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
-# Source2-md5:	b49a7b7f2db5b07306b7b5739e87ccc0
+# Source2-md5:	67a98eef6eed6fde18ec5e422bbdd074
 Source3:	%{name}-jaxp-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
-# Source3-md5:	6bd5ae187272a209439d1a95ac6c9025
+# Source3-md5:	fc20a017e3d3598de65240bc9a2ffbbc
 Source4:	%{name}-jaxws-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
-# Source4-md5:	15e6a93009bdc73194e7118988d5ab8d
+# Source4-md5:	669f95ee39534dcbbe538cb59bc78742
 Source5:	%{name}-jdk-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
-# Source5-md5:	74f2cf3815659b83993c4187e7fc4f6b
+# Source5-md5:	58fa5f03c7da51a07c000881ca8e1b1b
 Source6:	%{name}-langtools-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
-# Source6-md5:	de5c9b5fdbcd75028b71ed667d4b99d2
+# Source6-md5:	b85df8468b42a7c14c5d55e84339a2dd
 Source7:	%{name}-nashorn-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
-# Source7-md5:	7da4e88349cfc45ee9726eaa4386be03
+# Source7-md5:	1f9358090dc4ba710a14f31115de7c5f
 Source10:	make-cacerts.sh
 Patch0:		adjust-mflags.patch
 Patch1:		format_strings.patch
@@ -53,6 +56,8 @@ Patch4:		system-libjpeg.patch
 Patch5:		system-libpng.patch
 Patch6:		system-lcms.patch
 Patch7:		system-pcsclite.patch
+Patch8:		x32.patch
+Patch9:		current_stack_pointer.patch
 URL:		http://openjdk.java.net/
 BuildRequires:	/usr/bin/jar
 BuildRequires:	alsa-lib-devel
@@ -183,7 +188,7 @@ Summary:	OpenJDK - software development kit
 Summary(pl.UTF-8):	Kod OpenJDK - środowisko programistyczne
 Group:		Development/Languages/Java
 Requires:	%{name}-jre-base = %{version}-%{release}
-Requires:	jpackage-utils >= 0:1.7.5-4
+Requires:	jpackage-utils >= 0:1.7.5-7
 Provides:	jdk(%{name})
 
 %description jdk-base
@@ -266,7 +271,7 @@ wolnego oprogramowania.
 Summary:	OpenJDK - runtime environment
 Summary(pl.UTF-8):	OpenJDK - środowisko uruchomieniowe
 Group:		Development/Languages/Java
-Requires:	jpackage-utils >= 0:1.7.5-4
+Requires:	jpackage-utils >= 0:1.7.5-7
 Provides:	jre(%{name})
 
 %description jre-base
@@ -418,6 +423,8 @@ done
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.
@@ -427,6 +434,7 @@ if [ ! -f /proc/self/stat ]; then
 fi
 
 cd common/autoconf
+rm generated-configure.sh
 %{__autoconf} -o generated-configure.sh
 cd ../..
 
@@ -445,6 +453,9 @@ chmod a+x configure
 
 # disable-debug-symbols so openjdk debuginfo handling won't conflict with ours
 %configure \
+%ifarch x32
+	--with-jvm-variants=zero \
+%endif
 	--with-extra-cflags="%{rpmcflags}" \
 	--with-extra-cxxflags="%{rpmcxxflags}" \
 	--with-extra-ldflags="%{rpmldflags}" \
@@ -775,7 +786,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjava_crw_demo.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjavajpeg.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjavalcms.so
-%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjawt.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjdwp.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjsdt.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjsig.so
@@ -836,6 +846,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libsplashscreen.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libawt_xawt.so
 %attr(755,root,root) %{dstdir}/lib/%{jre_arch}/libjawt.so
+%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjawt.so
 
 %files jre-base-alsa
 %defattr(644,root,root,755)