diff --git a/.gitignore b/.gitignore index e55e6d3..ae4302c 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /openjdk-icedtea-2.4.3.tar.xz /openjdk-icedtea-2.3.13.tar.xz /openjdk-icedtea-2.4.4.tar.xz +/openjdk-icedtea-2.4.5.tar.xz diff --git a/1015432.patch b/1015432.patch deleted file mode 100644 index 709f0a9..0000000 --- a/1015432.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp Wed Oct 23 15:44:12 2013 -0700 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Thu Dec 19 16:03:33 2013 +0000 -@@ -4797,9 +4797,19 @@ - // size. Add a page for compiler2 recursion in main thread. - // Add in 2*BytesPerWord times page size to account for VM stack during - // class initialization depending on 32 or 64 bit VM. -+ -+ - os::Linux::min_stack_allowed = MAX2(os::Linux::min_stack_allowed, - (size_t)(StackYellowPages+StackRedPages+StackShadowPages) * Linux::page_size() + -- (2*BytesPerWord COMPILER2_PRESENT(+1)) * Linux::vm_default_page_size()); -+ (2*BytesPerWord COMPILER2_PRESENT(+1)) -+ * -+#ifdef PPC -+ NOT_ZERO ( Linux::vm_default_page_size() ) -+ ZERO_ONLY ( Linux::page_size() ) -+#else -+ ( Linux::vm_default_page_size() ) -+#endif -+ ); - - size_t threadStackSizeInBytes = ThreadStackSize * K; - if (threadStackSizeInBytes != 0 && diff --git a/1029588.patch b/1029588.patch deleted file mode 100644 index 6ad965f..0000000 --- a/1029588.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# HG changeset patch -# User andrew -# Date 1357338114 0 -# Node ID a57f192585241b5e3f004067f77ebffcfc534df5 -# Parent 0685d07e5b432570a695af560f9dc7164a59a931 -Include defs.make in buildtree.make so ZERO_BUILD is recognised and JVM_VARIANT_ZERO set. - -diff -r 0685d07e5b43 -r a57f19258524 openjdk/hotspot/make/linux/makefiles/buildtree.make ---- openjdk/hotspot/make/linux/makefiles/buildtree.make Thu Jan 03 15:32:49 2013 +0000 -+++ openjdk/hotspot/make/linux/makefiles/buildtree.make Fri Jan 04 22:21:54 2013 +0000 -@@ -192,6 +193,7 @@ - $(BUILDTREE_COMMENT); \ - echo; \ - echo "Platform_file = $(PLATFORM_FILE)" | sed 's|$(GAMMADIR)|$$(GAMMADIR)|'; \ -+ echo "JVM_VARIANTS = $(JVM_VARIANTS)"; \ - sed -n '/=/s/^ */Platform_/p' < $(PLATFORM_FILE); \ - echo; \ - echo "GAMMADIR = $(GAMMADIR)"; \ - diff --git a/java-1.7.0-openjdk-ppc-zero-hotspot.patch b/java-1.7.0-openjdk-ppc-zero-hotspot.patch deleted file mode 100644 index 7b6195b..0000000 --- a/java-1.7.0-openjdk-ppc-zero-hotspot.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2012-03-23 10:57:01.000000000 -0400 -+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2012-03-23 10:57:00.000000000 -0400 -@@ -34,9 +34,9 @@ - define_pd_global(bool, DontYieldALot, false); - define_pd_global(intx, ThreadStackSize, 1664); - #ifdef _LP64 --define_pd_global(intx, VMThreadStackSize, 1024); -+define_pd_global(intx, VMThreadStackSize, 1664); - #else --define_pd_global(intx, VMThreadStackSize, 512); -+define_pd_global(intx, VMThreadStackSize, 1152); - #endif // _LP64 - define_pd_global(intx, CompilerThreadStackSize, 0); - define_pd_global(uintx, JVMInvokeMethodSlack, 8192); diff --git a/java-1.7.0-openjdk-ppc-zero-jdk.patch b/java-1.7.0-openjdk-ppc-zero-jdk.patch deleted file mode 100644 index 6dfcbd5..0000000 --- a/java-1.7.0-openjdk-ppc-zero-jdk.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- openjdk/jdk/make/common/shared/Defs-java.gmk 2012-03-23 10:56:45.000000000 -0400 -+++ openjdk/jdk/make/common/shared/Defs-java.gmk 2012-03-23 10:56:45.000000000 -0400 -@@ -88,7 +88,7 @@ - - # 64-bit builds require a larger thread stack size. - ifeq ($(ARCH_DATA_MODEL), 32) -- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768 -+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1152 - else - JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664 - endif -diff -up openjdk/corba/make/common/shared/Defs-java.gmk.ppc openjdk/corba/make/common/shared/Defs-java.gmk ---- openjdk/corba/make/common/shared/Defs-java.gmk.ppc 2012-03-24 11:44:34.450072733 +0100 -+++ openjdk/corba/make/common/shared/Defs-java.gmk 2012-03-24 11:44:53.300073137 +0100 -@@ -79,7 +79,7 @@ - - # 64-bit builds require a larger thread stack size. - ifeq ($(ARCH_DATA_MODEL), 32) -- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768 -+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1152 - else - JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664 - endif diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec index 934f0b1..4106a49 100644 --- a/java-1.7.0-openjdk.spec +++ b/java-1.7.0-openjdk.spec @@ -1,7 +1,7 @@ # If debug is 1, OpenJDK is built with all debug info present. %global debug 0 -%global icedtea_version 2.4.4 +%global icedtea_version 2.4.5 %global hg_tag icedtea-{icedtea_version} %global aarch64 aarch64 arm64 armv8 @@ -105,7 +105,7 @@ %global origin openjdk %global updatever 51 #Fedora have an bogus 60 instead of updatever. Fix when updatever>=60 in version: -%global buildver 02 +%global buildver 31 # Keep priority on 6digits in case updatever>9 %global priority 1700%{updatever} %global javaver 1.7.0 @@ -149,7 +149,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.60 -Release: %{icedtea_version}.1%{?dist} +Release: %{icedtea_version}.0%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -241,10 +241,6 @@ Patch6: %{name}-debuginfo.patch # Add rhino support Patch100: rhino.patch -# Patch for PPC/PPC64 -Patch104: %{name}-ppc-zero-jdk.patch -Patch105: %{name}-ppc-zero-hotspot.patch - Patch106: %{name}-freetype-check-fix.patch # allow to create hs_pid.log in tmp (in 700 permissions) if working directory is unwritable @@ -261,9 +257,6 @@ Patch300: pulse-soundproperties.patch #Workaround RH902004 Patch402: gstackbounds.patch Patch403: PStack-808293.patch -Patch410: 1015432.patch -Patch411: 1029588.patch -Patch412: zero-x32.diff # End of tmp patches BuildRequires: autoconf @@ -284,7 +277,6 @@ BuildRequires: libpng-devel BuildRequires: wget BuildRequires: libxslt BuildRequires: xorg-x11-proto-devel -BuildRequires: mercurial BuildRequires: ant BuildRequires: ant-nodeps BuildRequires: libXinerama-devel @@ -300,10 +292,10 @@ BuildRequires: at-spi-devel BuildRequires: gawk BuildRequires: pkgconfig >= 0.9.0 BuildRequires: xorg-x11-utils +BuildRequires: nss-devel # PulseAudio build requirements. %if %{with_pulseaudio} BuildRequires: pulseaudio-libs-devel >= 0.9.11 -BuildRequires: pulseaudio >= 0.9.11 %endif # Zero-assembler build requirement. %ifnarch %{jit_arches} @@ -503,20 +495,10 @@ tar xzf %{SOURCE9} %patch106 %patch200 -%ifarch ppc ppc64 -# PPC fixes -%patch104 -%patch105 -%endif - -%ifarch %{jit_arches} %patch402 %patch403 -%endif -%patch410 -%patch411 -%patch412 + %build # How many cpu's do we have? @@ -597,13 +579,15 @@ make \ DISTRO_PACKAGE_VERSION="fedora-%{release}-%{_arch} u%{updatever}-b%{buildver}" \ JDK_UPDATE_VERSION=`printf "%02d" %{updatever}` \ JDK_BUILD_NUMBER=b`printf "%02d" %{buildver}` \ + JRE_RELEASE_VERSION=%{javaver}_`printf "%02d" %{updatever}`-b`printf "%02d" %{buildver}` \ MILESTONE="fcs" \ + ALT_PARALLEL_COMPILE_JOBS="$NUM_PROC" \ HOTSPOT_BUILD_JOBS="$NUM_PROC" \ STATIC_CXX="false" \ RHINO_JAR="$PWD/../rhino/rhino.jar" \ GENSRCDIR="$PWD/generated.build" \ - FT2_CFLAGS="-I/usr/include/freetype2 " \ - FT2_LIBS="-lfreetype " \ + FT2_CFLAGS="`pkg-config --cflags freetype2` " \ + FT2_LIBS="`pkg-config --libs freetype2` " \ DEBUG_CLASSFILES="true" \ DEBUG_BINARIES="true" \ STRIP_POLICY="no_strip" \ @@ -1314,6 +1298,26 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Thu Jan 30 2014 Jiri Vanek - 1.7.0.51-2.4.5.0.f19 +- removed buildRequires: pulseaudio >= 0.9.11, as not neccessary + - but kept libs-devel +- updated to icedtea 2.4.5 + - http://blog.fuseyism.com/index.php/2014/01/29/icedtea-2-4-5-released/ +- removed upstreamed or unwonted patches (thanx to gnu_andrew to pointing them out) + - patch410 1015432.patch (upstreamed) + - patch411 1029588.patch + - patch412 zero-x32.diff + - patch104 java-1.7.0-ppc-zero-jdk.patch + - patch105 java-1.7.0-ppc-zero-hotspot.patch +- patch402 gstackbounds.patch and patch403 PStack-808293.patch applied always + (again thanx to gnu_andrew) +- merged other gnu_andrew's changes + - FT2_CFLAGS and FT2_LIBS hardoced values replaced by correct pkg-config calls + - buildver bumbed to 31 +- added build requires nss-devel +- removed build requires mercurial +- added JRE_RELEASE_VERSION and ALT_PARALLEL_COMPILE_JOBS into make call + * Fri Jan 17 2014 Jiri Vanek - 1.7.0.51-2.4.4.1.f19 - added zero fix for alternative arches - patch412 zero-x32.diff to try to fix zero builds build diff --git a/sources b/sources index aa7eb60..f4a65db 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ ea344cc5b53b73f375558ba41760ff64 class-rewriter.tar.gz 1cb61996cf5dbe80827abbe7d009bf28 pulseaudio.tar.gz 785b5ff80beef8cc095e25345c6c8242 systemtap-tapset-2013-10-02.tar.gz -d82a5b549b0050d0e3071189df822164 openjdk-icedtea-2.4.4.tar.xz \ No newline at end of file +ee3e2afb9714191159b2041365fb1a4c openjdk-icedtea-2.4.5.tar.xz diff --git a/zero-x32.diff b/zero-x32.diff deleted file mode 100644 index 10f911f..0000000 --- a/zero-x32.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- openjdk/hotspot/make/linux/makefiles/buildtree.make~ 2014-01-17 07:01:20.584904000 -0500 -+++ openjdk/hotspot/make/linux/makefiles/buildtree.make 2014-01-17 08:01:29.114904000 -0500 -@@ -211,6 +211,7 @@ - echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ - echo "OPENJDK = $(OPENJDK)"; \ - echo "ZERO_BUILD = $(ZERO_BUILD)"; \ -+ echo "JVM_VARIANT_ZERO = $(JVM_VARIANT_ZERO)"; \ - echo; \ - echo "# Used for platform dispatching"; \ - echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \