[packages/openjdk17] up to 17.0.2
atler
atler at pld-linux.org
Wed Feb 9 14:23:10 CET 2022
commit 12a511b375030d24d79c92f36ff99357ae7b7cde
Author: Jan Palus <atler at pld-linux.org>
Date: Wed Feb 9 14:22:50 2022 +0100
up to 17.0.2
no_optflags.patch | 23 +++++++++++------------
openjdk16.spec => openjdk17.spec | 30 +++++++++++-------------------
2 files changed, 22 insertions(+), 31 deletions(-)
---
diff --git a/openjdk16.spec b/openjdk17.spec
similarity index 97%
rename from openjdk16.spec
rename to openjdk17.spec
index e6ef2f4..35b875d 100644
--- a/openjdk16.spec
+++ b/openjdk17.spec
@@ -2,13 +2,9 @@
%bcond_without cacerts # don't include the default CA certificates
%if %{with bootstrap}
-%define use_jdk openjdk15
-%else
%define use_jdk openjdk16
-%endif
-
-%ifarch %{x8664} aarch64
-%define with_aot 1
+%else
+%define use_jdk openjdk17
%endif
%ifarch x32
@@ -20,17 +16,17 @@
%endif
# class data version seen with file(1) that this jvm is able to load
-%define _classdataversion 60.0
+%define _classdataversion 61.0
Summary: Open-source implementation of the Java Platform, Standard Edition
-Summary(pl.UTF-8): Wolnoźródłowa implementacja Java 16 SE
-Name: openjdk16
-Version: 16.0.2
+Summary(pl.UTF-8): Wolnoźródłowa implementacja Java 17 SE
+Name: openjdk17
+Version: 17.0.2
Release: 1
License: GPL v2
Group: Development/Languages/Java
-Source0: https://github.com/openjdk/jdk16u/archive/jdk-%{version}-ga/%{name}-%{version}.tar.gz
-# Source0-md5: 08b1c057136a6756cd8e4609dc517339
+Source0: https://github.com/openjdk/jdk17u/archive/jdk-%{version}-ga/%{name}-%{version}.tar.gz
+# Source0-md5: 94344312ee396394964f51933936f7aa
Source10: make-cacerts.sh
Patch0: no_optflags.patch
URL: http://openjdk.java.net/
@@ -342,7 +338,7 @@ Code examples for OpenJDK.
Przykłady dla OpenJDK.
%prep
-%setup -qn jdk16u-jdk-%{version}-ga
+%setup -qn jdk17u-jdk-%{version}-ga
%patch0 -p1
@@ -462,7 +458,6 @@ rm -rf $RPM_BUILD_ROOT
%files jdk
%defattr(644,root,root,755)
-%{?with_aot:%attr(755,root,root) %{_bindir}/jaotc}
%attr(755,root,root) %{_bindir}/jarsigner
%attr(755,root,root) %{_bindir}/javac
%attr(755,root,root) %{_bindir}/javadoc
@@ -486,7 +481,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/jstatd
%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*
@@ -513,7 +507,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%dir %{dstdir}
%{_jvmdir}/%{name}
-%{?with_aot:%attr(755,root,root) %{dstdir}/bin/jaotc}
%attr(755,root,root) %{dstdir}/bin/jar
%attr(755,root,root) %{dstdir}/bin/jarsigner
%attr(755,root,root) %{dstdir}/bin/javac
@@ -546,13 +539,11 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/jfr
%attr(755,root,root) %{_bindir}/jrunscript
%attr(755,root,root) %{_bindir}/keytool
-%attr(755,root,root) %{_bindir}/rmid
%attr(755,root,root) %{_bindir}/rmiregistry
%{_mandir}/man1/java.1*
%{_mandir}/man1/jfr.1*
%{_mandir}/man1/jrunscript.1*
%{_mandir}/man1/keytool.1*
-%{_mandir}/man1/rmid.1*
%{_mandir}/man1/rmiregistry.1*
%files jre-base
@@ -567,7 +558,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{dstdir}/bin/jfr
%attr(755,root,root) %{dstdir}/bin/jrunscript
%attr(755,root,root) %{dstdir}/bin/keytool
-%attr(755,root,root) %{dstdir}/bin/rmid
%attr(755,root,root) %{dstdir}/bin/rmiregistry
%{dstdir}/conf
%{dstdir}/legal
@@ -595,12 +585,14 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{dstdir}/lib/libjava.so
%attr(755,root,root) %{dstdir}/lib/libjimage.so
%attr(755,root,root) %{dstdir}/lib/libjli.so
+%attr(755,root,root) %{dstdir}/lib/libjsvml.so
%attr(755,root,root) %{dstdir}/lib/liblcms.so
%attr(755,root,root) %{dstdir}/lib/libmanagement_agent.so
%attr(755,root,root) %{dstdir}/lib/libmanagement_ext.so
%attr(755,root,root) %{dstdir}/lib/libprefs.so
%attr(755,root,root) %{dstdir}/lib/librmi.so
%attr(755,root,root) %{dstdir}/lib/libsctp.so
+%attr(755,root,root) %{dstdir}/lib/libsyslookup.so
%attr(755,root,root) %{dstdir}/lib/libjavajpeg.so
%attr(755,root,root) %{dstdir}/lib/libjdwp.so
%attr(755,root,root) %{dstdir}/lib/libjsig.so
diff --git a/no_optflags.patch b/no_optflags.patch
index cea7b5b..e8d6b6d 100644
--- a/no_optflags.patch
+++ b/no_optflags.patch
@@ -1,31 +1,30 @@
---- jdk15u-jdk-15.0.6-ga/make/common/NativeCompilation.gmk.orig 2022-01-18 11:40:33.000000000 +0100
-+++ jdk15u-jdk-15.0.6-ga/make/common/NativeCompilation.gmk 2022-02-09 12:40:58.622750325 +0100
-@@ -353,13 +353,13 @@
+--- jdk17u-jdk-17.0.2-ga/make/common/NativeCompilation.gmk.orig 2021-12-07 19:03:22.000000000 +0100
++++ jdk17u-jdk-17.0.2-ga/make/common/NativeCompilation.gmk 2022-02-09 13:29:15.184653743 +0100
+@@ -347,12 +347,12 @@
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) -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) -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)), )
-@@ -370,7 +370,7 @@
+ else ifneq ($$(filter %.S, $$($1_FILENAME)), )
+ # Compile as preprocessed assembler file
+@@ -361,7 +361,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) -c
+ $$($1_CXXFLAGS) -c
$1_COMPILER := $$($$($1_BASE)_CXX)
- $1_DEP_FLAG := $(CXX_FLAG_DEPS)
else
-@@ -775,7 +775,7 @@
+ $$(error Internal error in NativeCompilation.gmk: no compiler for file $$($1_FILENAME))
+@@ -773,7 +773,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 +33,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)
-@@ -820,7 +820,7 @@
+@@ -818,7 +818,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) \
-+ -x c++-header -c $(C_FLAG_DEPS) \
+- $$($1_OPT_CFLAGS) -x c++-header -c $(GENDEPS_FLAGS) \
++ -x c++-header -c $(GENDEPS_FLAGS) \
$$(addsuffix .tmp, $$($1_PCH_DEPS_FILE))
$$($1_PCH_FILE): $$($1_PRECOMPILED_HEADER) $$($1_COMPILE_VARDEPS_FILE)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openjdk17.git/commitdiff/12a511b375030d24d79c92f36ff99357ae7b7cde
More information about the pld-cvs-commit
mailing list