[packages/openjdk20] new (20.0.2)
atler
atler at pld-linux.org
Tue Aug 29 14:59:23 CEST 2023
commit 33270dac32ce2955158d02cb2e314719149b9df7
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Aug 29 14:07:18 2023 +0200
new (20.0.2)
no_optflags.patch | 7 ++++---
openjdk19.spec => openjdk20.spec | 18 +++++++++---------
2 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/openjdk19.spec b/openjdk20.spec
similarity index 98%
rename from openjdk19.spec
rename to openjdk20.spec
index 769340b..60e630a 100644
--- a/openjdk19.spec
+++ b/openjdk20.spec
@@ -2,9 +2,9 @@
%bcond_without cacerts # don't include the default CA certificates
%if %{with bootstrap}
-%define use_jdk openjdk18
-%else
%define use_jdk openjdk19
+%else
+%define use_jdk openjdk20
%endif
%ifarch x32
@@ -20,17 +20,17 @@
%endif
# class data version seen with file(1) that this jvm is able to load
-%define _classdataversion 63.0
+%define _classdataversion 64.0
Summary: Open-source implementation of the Java Platform, Standard Edition
-Summary(pl.UTF-8): Wolnoźródłowa implementacja Java 19 SE
-Name: openjdk19
-Version: 19.0.2
+Summary(pl.UTF-8): Wolnoźródłowa implementacja Java 20 SE
+Name: openjdk20
+Version: 20.0.2
Release: 1
License: GPL v2
Group: Development/Languages/Java
-Source0: https://github.com/openjdk/jdk19u/archive/jdk-%{version}-ga/%{name}-%{version}.tar.gz
-# Source0-md5: 2c5489f4830bce40240dc4f76f890156
+Source0: https://github.com/openjdk/jdk20u/archive/jdk-%{version}-ga/%{name}-%{version}.tar.gz
+# Source0-md5: 0a6c990bd0a4eee6eee06e89b74cde19
Source10: make-cacerts.sh
Patch0: no_optflags.patch
Patch1: x32.patch
@@ -346,7 +346,7 @@ Code examples for OpenJDK.
Przykłady dla OpenJDK.
%prep
-%setup -qn jdk19u-jdk-%{version}-ga
+%setup -qn jdk20u-jdk-%{version}-ga
%patch0 -p1
%patch1 -p1
diff --git a/no_optflags.patch b/no_optflags.patch
index e8d6b6d..7022a38 100644
--- a/no_optflags.patch
+++ b/no_optflags.patch
@@ -1,14 +1,15 @@
--- 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)), )
+@@ -347,13 +347,13 @@
# Compile as a C file
+ $1_CFLAGS += $$($1_WARNINGS_FLAGS)
$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)
else ifneq ($$(filter %.m, $$($1_FILENAME)), )
# Compile as an Objective-C file
+ $1_CFLAGS += $$($1_WARNINGS_FLAGS)
$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
@@ -16,8 +17,8 @@
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_CXXFLAGS += $$($1_WARNINGS_FLAGS)
$1_FLAGS := $(CFLAGS_CCACHE) $$($1_USE_PCH_FLAGS) $$($1_BASE_CXXFLAGS) \
- $$($1_OPT_CXXFLAGS) $$($1_CXXFLAGS) -c
+ $$($1_CXXFLAGS) -c
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openjdk20.git/commitdiff/33270dac32ce2955158d02cb2e314719149b9df7
More information about the pld-cvs-commit
mailing list