[packages/openjdk13] up to 13.0.10
atler
atler at pld-linux.org
Wed Feb 9 14:12:47 CET 2022
commit 9edd41c4508df9e27ca74ea67ae29a0205fdf426
Author: Jan Palus <atler at pld-linux.org>
Date: Wed Feb 9 14:11:26 2022 +0100
up to 13.0.10
make-4.3.patch | 34 ----------------------------------
no_optflags.patch | 30 +++++++++++++++---------------
openjdk12.spec => openjdk13.spec | 35 +++++++++++++++++++++--------------
3 files changed, 36 insertions(+), 63 deletions(-)
---
diff --git a/openjdk12.spec b/openjdk13.spec
similarity index 96%
rename from openjdk12.spec
rename to openjdk13.spec
index 99b63ab..94a4e4e 100644
--- a/openjdk12.spec
+++ b/openjdk13.spec
@@ -2,9 +2,9 @@
%bcond_without cacerts # don't include the default CA certificates
%if %{with bootstrap}
-%define use_jdk openjdk11
-%else
%define use_jdk openjdk12
+%else
+%define use_jdk openjdk13
%endif
%ifarch %{x8664} aarch64
@@ -20,20 +20,19 @@
%endif
# class data version seen with file(1) that this jvm is able to load
-%define _classdataversion 56.0
+%define _classdataversion 57.0
Summary: Open-source implementation of the Java Platform, Standard Edition
-Summary(pl.UTF-8): Wolnoźródłowa implementacja Java 12 SE
-Name: openjdk12
-Version: 12.0.2
+Summary(pl.UTF-8): Wolnoźródłowa implementacja Java 13 SE
+Name: openjdk13
+Version: 13.0.10
Release: 1
License: GPL v2
Group: Development/Languages/Java
-Source0: https://github.com/openjdk/jdk12u/archive/jdk-%{version}-ga/%{name}-%{version}.tar.gz
-# Source0-md5: fe3addb26254c5a9ac17922358e2a055
+Source0: https://github.com/openjdk/jdk13u/archive/jdk-%{version}-ga/%{name}-%{version}.tar.gz
+# Source0-md5: 270e32c28e48244c6a57d518433bf7ae
Source10: make-cacerts.sh
Patch0: no_optflags.patch
-Patch1: make-4.3.patch
URL: http://openjdk.java.net/
BuildRequires: /usr/bin/jar
BuildRequires: alsa-lib-devel
@@ -47,6 +46,7 @@ BuildRequires: freetype-devel >= 1:2.10.2
BuildRequires: gawk
BuildRequires: giflib-devel >= 5.2.1
BuildRequires: glibc-misc
+BuildRequires: harfbuzz-devel >= 2.3.1
%{?buildrequires_jdk}
BuildRequires: lcms2-devel >= 2.11
BuildRequires: libjpeg-devel
@@ -257,6 +257,7 @@ Summary(pl.UTF-8): OpenJDK - środowisko uruchomieniowe - obsługa fontów
Group: Development/Languages/Java
Requires: %{name}-jre-base = %{version}-%{release}
Requires: freetype >= 1:2.10.2
+Requires: harfbuzz >= 2.3.1
%description jre-base-freetype
Font handling library for OpenJDK runtime environment built using free
@@ -341,10 +342,9 @@ Code examples for OpenJDK.
Przykłady dla OpenJDK.
%prep
-%setup -qn jdk12u-jdk-%{version}-ga
+%setup -qn jdk13u-jdk-%{version}-ga
%patch0 -p1
-%patch1 -p1
%build
# Make sure we have /proc mounted - otherwise idlc will fail later.
@@ -370,8 +370,8 @@ chmod a+x configure
%configure \
%{?with_zero:--with-jvm-variants=zero} \
--with-boot-jdk="%{java_home}" \
- --with-extra-cflags="%{rpmcppflags} %{rpmcflags} -fcommon -O0" \
- --with-extra-cxxflags="%{rpmcppflags} %{rpmcxxflags} -fcommon -O0" \
+ --with-extra-cflags="%{rpmcppflags} %{rpmcflags} -fcommon" \
+ --with-extra-cxxflags="%{rpmcppflags} %{rpmcxxflags} -fcommon" \
--with-extra-ldflags="%{rpmldflags}" \
--with-jni-libpath="%{_libdir}/java %{_libdir} /%{_lib}" \
--with-jvm-features="%{?with_shenandoahgc:shenandoahgc}" \
@@ -383,6 +383,7 @@ chmod a+x configure
--with-jobs="%{__jobs}" \
--with-freetype=system \
--with-giflib=system \
+ --with-harfbuzz=system \
--with-libjpeg=system \
--with-libpng=system \
--with-lcms=system \
@@ -485,6 +486,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/rmic
%attr(755,root,root) %{_bindir}/serialver
%{_jvmdir}/java
+%{?with_aot:%{_mandir}/man1/jaotc.1*}
%{_mandir}/man1/jarsigner.1*
%{_mandir}/man1/javac.1*
%{_mandir}/man1/javadoc.1*
@@ -492,10 +494,15 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/jcmd.1*
%{_mandir}/man1/jconsole.1*
%{_mandir}/man1/jdb.1*
+%{_mandir}/man1/jdeprscan.1*
%{_mandir}/man1/jdeps.1*
+%{!?with_zero:%{_mandir}/man1/jhsdb.1*}
%{_mandir}/man1/jinfo.1*
+%{_mandir}/man1/jlink.1*
%{_mandir}/man1/jmap.1*
+%{_mandir}/man1/jmod.1*
%{_mandir}/man1/jps.1*
+%{_mandir}/man1/jshell.1*
%{_mandir}/man1/jstack.1*
%{_mandir}/man1/jstat.1*
%{_mandir}/man1/jstatd.1*
@@ -545,6 +552,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/rmiregistry
%attr(755,root,root) %{_bindir}/unpack200
%{_mandir}/man1/java.1*
+%{_mandir}/man1/jfr.1*
%{_mandir}/man1/jjs.1*
%{_mandir}/man1/jrunscript.1*
%{_mandir}/man1/keytool.1*
@@ -578,7 +586,6 @@ rm -rf $RPM_BUILD_ROOT
%{dstdir}/lib/security
%dir %{dstdir}/lib/server
%attr(755,root,root) %{dstdir}/lib/server/*.so
-%{dstdir}/lib/server/Xusage.txt
%{dstdir}/lib/server/classes.jsa
%{!?with_zero:%{dstdir}/lib/classlist}
%{dstdir}/lib/jrt-fs.jar
diff --git a/make-4.3.patch b/make-4.3.patch
deleted file mode 100644
index 76da003..0000000
--- a/make-4.3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# HG changeset patch
-# User ihse
-# Date 1580378910 -3600
-# Node ID 0743e1d49930a95d045bfdaa8f8607a00289e677
-# Parent 24b4c763cb2276db073bec263246879eb312daeb
-8237879: make 4.3 breaks build
-Reviewed-by: erikj, tbell
-
-diff -r 24b4c763cb22 -r 0743e1d49930 make/common/MakeBase.gmk
---- a/make/common/MakeBase.gmk Thu Jan 30 10:10:48 2020 +0100
-+++ b/make/common/MakeBase.gmk Thu Jan 30 11:08:30 2020 +0100
-@@ -525,15 +525,16 @@
- # Param 2 - (optional) name of file to store value in
- DependOnVariableHelper = \
- $(strip \
-- $(eval -include $(call DependOnVariableFileName, $1, $2)) \
-+ $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
-+ $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \
- $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
-- $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
-+ $(call MakeDir, $(dir $($1_filename))) \
- $(if $(findstring $(LOG_LEVEL), trace), \
- $(info NewVariable $1: >$(strip $($1))<) \
- $(info OldVariable $1: >$(strip $($1_old))<)) \
- $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
-- $(call DependOnVariableFileName, $1, $2))) \
-- $(call DependOnVariableFileName, $1, $2) \
-+ $($1_filename))) \
-+ $($1_filename) \
- )
-
- # Main macro
-
diff --git a/no_optflags.patch b/no_optflags.patch
index 372bbc1..e85b3d7 100644
--- a/no_optflags.patch
+++ b/no_optflags.patch
@@ -1,31 +1,31 @@
---- jdk12u-jdk-12.0.2-ga/make/common/NativeCompilation.gmk.orig 2019-07-16 18:38:28.000000000 +0200
-+++ jdk12u-jdk-12.0.2-ga/make/common/NativeCompilation.gmk 2022-02-08 09:20:46.175688972 +0100
-@@ -282,13 +282,13 @@
+--- jdk13u-jdk-13.0.10-ga/make/common/NativeCompilation.gmk.orig 2022-01-18 08:33:02.000000000 +0100
++++ jdk13u-jdk-13.0.10-ga/make/common/NativeCompilation.gmk 2022-02-09 12:16:42.666629522 +0100
+@@ -352,13 +352,13 @@
ifneq ($$(filter %.c, $$($1_FILENAME)), )
# Compile as a C file
$1_FLAGS := $(CFLAGS_CCACHE) $$($1_USE_PCH_FLAGS) $$($1_BASE_CFLAGS) \
-- $$($1_OPT_CFLAGS) $$($1_CFLAGS) $$($1_THIS_FILE) -c
-+ $$($1_CFLAGS) $$($1_THIS_FILE) -c
+- $$($1_OPT_CFLAGS) $$($1_CFLAGS) -c
++ $$($1_CFLAGS) -c
$1_COMPILER := $$($$($1_BASE)_CC)
$1_DEP_FLAG := $(C_FLAG_DEPS)
else ifneq ($$(filter %.m, $$($1_FILENAME)), )
# Compile as an Objective-C file
$1_FLAGS := -x objective-c $(CFLAGS_CCACHE) $$($1_USE_PCH_FLAGS) \
-- $$($1_BASE_CFLAGS) $$($1_OPT_CFLAGS) $$($1_CFLAGS) $$($1_THIS_FILE) -c
-+ $$($1_BASE_CFLAGS) $$($1_CFLAGS) $$($1_THIS_FILE) -c
+- $$($1_BASE_CFLAGS) $$($1_OPT_CFLAGS) $$($1_CFLAGS) -c
++ $$($1_BASE_CFLAGS) $$($1_CFLAGS) -c
$1_COMPILER := $$($$($1_BASE)_CC)
$1_DEP_FLAG := $(C_FLAG_DEPS)
else ifneq ($$(filter %.s %.S, $$($1_FILENAME)), )
-@@ -299,7 +299,7 @@
+@@ -369,7 +369,7 @@
else ifneq ($$(filter %.cpp %.cc %.mm, $$($1_FILENAME)), )
# Compile as a C++ or Objective-C++ file
$1_FLAGS := $(CFLAGS_CCACHE) $$($1_USE_PCH_FLAGS) $$($1_BASE_CXXFLAGS) \
-- $$($1_OPT_CXXFLAGS) $$($1_CXXFLAGS) $$($1_THIS_FILE) -c
-+ $$($1_CXXFLAGS) $$($1_THIS_FILE) -c
+- $$($1_OPT_CXXFLAGS) $$($1_CXXFLAGS) -c
++ $$($1_CXXFLAGS) -c
$1_COMPILER := $$($$($1_BASE)_CXX)
$1_DEP_FLAG := $(CXX_FLAG_DEPS)
else
-@@ -679,7 +679,7 @@
+@@ -782,7 +782,7 @@
# lines for all object files in this setup. This includes at least all the
# variables used in the call to add_native_source below.
$1_COMPILE_VARDEPS := $$($1_CFLAGS) $$($1_EXTRA_CFLAGS) $$($1_SYSROOT_CFLAGS) \
@@ -34,12 +34,12 @@
$$($1_CC) $$($1_CXX) $$($1_AS) $$($1_ASFLAGS)
$1_COMPILE_VARDEPS_FILE := $$(call DependOnVariable, $1_COMPILE_VARDEPS, \
$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).comp.vardeps)
-@@ -725,7 +725,7 @@
- -include $$($1_PCH_DEP_TARGETS)
+@@ -827,7 +827,7 @@
+ -include $$($1_PCH_DEPS_TARGETS_FILE)
$1_PCH_COMMAND := $$($1_CC) $$($1_CFLAGS) $$($1_EXTRA_CFLAGS) $$($1_SYSROOT_CFLAGS) \
-- $$($1_OPT_CFLAGS) -x c++-header -c $(C_FLAG_DEPS) $$($1_PCH_DEP)
-+ -x c++-header -c $(C_FLAG_DEPS) $$($1_PCH_DEP)
+- $$($1_OPT_CFLAGS) -x c++-header -c $(C_FLAG_DEPS) $$($1_PCH_DEPS_FILE)
++ -x c++-header -c $(C_FLAG_DEPS) $$($1_PCH_DEPS_FILE)
$$($1_PCH_FILE): $$($1_PRECOMPILED_HEADER) $$($1_COMPILE_VARDEPS_FILE)
$$(call LogInfo, Generating precompiled header)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openjdk13.git/commitdiff/9edd41c4508df9e27ca74ea67ae29a0205fdf426
More information about the pld-cvs-commit
mailing list