X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenjdk9.git;a=blobdiff_plain;f=openjdk8.spec;h=a932527712acb3c251c7c5696bac4aae62df2c6c;hp=fec6f3cc90f694f6aa810d3a458dbdaea533d506;hb=8327989;hpb=93299fbf9e1cb9b96c2eb0702803189a9ba0e06c

diff --git a/openjdk8.spec b/openjdk8.spec
index fec6f3c..a932527 100644
--- a/openjdk8.spec
+++ b/openjdk8.spec
@@ -1,11 +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:
-# 	- fix BuildRequires
-#	- fix build with system giflib
 #	- 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
@@ -27,7 +28,7 @@ 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:	2
 License:	GPL v2
 Group:		Development/Languages/Java
 Source0:	%{name}-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
@@ -55,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
@@ -65,7 +68,7 @@ BuildRequires:	bash
 BuildRequires:	cups-devel
 BuildRequires:	freetype-devel >= 2.3
 BuildRequires:	gawk
-#BuildRequires:	giflib-devel >= 5.1
+BuildRequires:	giflib-devel >= 5.1
 BuildRequires:	glibc-misc
 %{?buildrequires_jdk}
 BuildRequires:	lcms2-devel
@@ -185,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
@@ -268,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
@@ -420,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.
@@ -429,6 +434,7 @@ if [ ! -f /proc/self/stat ]; then
 fi
 
 cd common/autoconf
+rm generated-configure.sh
 %{__autoconf} -o generated-configure.sh
 cd ../..
 
@@ -447,11 +453,14 @@ 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}" \
 	--disable-debug-symbols \
-	--with-giflib=bundled \
+	--with-giflib=system \
 	--with-libjpeg=system \
 	--with-libpng=system \
 	--with-lcms=system \
@@ -777,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
@@ -838,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)