pool/java-17-openj9
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-17-openj9?expand=0&rev=15

Browse Source
This commit is contained in:
Fridrich Strba 2022-08-09 16:57:49 +00:00 committed by Git OBS Bridge
parent 7176c95805
commit d60dad6708
11 changed files with 76 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
04a55b45b3a0d75813335fda0fb8703819690ee7.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:726d2b76b131e9fd9bb65e44614a471bad187d6a1bf6177ffe0c875019b67dc6
size 28189423

3
9a84ec34ed321967cdbe67b29ddcd732b591d051.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:122f6fc146e36191da167f4f33abbfca02f974f8acee81a323e2988e771dc536
size 27990342

3
ab24b6666596140516d3f240486aa1c84a726775.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5ef24809ee60389cdb63b3df3cb8d265466bd02c01530e5b1f4cacf629d4d0de
size 10935643

3
b58aa2708c095efadf522f67aaef9f7de2a7cbc7.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3acea855f140147e125035a00f9d30c31dcde4f65acda5b04828b02fad7b8c84
size 10979425

3
d680e266ef43d1c2e239c7d2fd49e6f9a11992ed.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6b055c08f644e27d3a138df87d052c6860c444ebfe3eb08be516d47a20edf2de
size 167015023

3
dc07fd49b926c28c33b17053b11ad3121429239f.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:346efa0d79779326c43070051441116fb8a46a680f8186e75bc5675fe9e92cab
size 166773465

3
freemarker-2.3.29-sources.jar
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9be4c63f2d68d915daffbef9c8a9b63394a41a846871978be0421c962b51b603
size 1254826

3
freemarker-2.3.29.jar
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ce9ffbcd065cbce1d5bf295755965167cdbaea4d13039a09e842cea32f0d7655
size 1586948

36
java-17-openj9.spec
View File

@ -29,20 +29,19 @@
# Standard JPackage naming and versioning defines.
%global featurever 17
%global interimver 0
%global updatever 3
%global datever 2022-04-19
%global buildver 7
%global updatever 4
%global datever 2022-07-19
%global buildver 8
%global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk17/archive
%global root_revision dc07fd49b926c28c33b17053b11ad3121429239f
%global root_branch v0.32.0-release
%global root_revision d680e266ef43d1c2e239c7d2fd49e6f9a11992ed
%global root_branch v0.33.0-release
%global omr_repository https://github.com/eclipse/openj9-omr/archive
%global omr_revision ab24b6666596140516d3f240486aa1c84a726775
%global omr_branch v0.32.0-release
%global omr_revision b58aa2708c095efadf522f67aaef9f7de2a7cbc7
%global omr_branch v0.33.0-release
%global openj9_repository https://github.com/eclipse/openj9/archive
%global openj9_revision 9a84ec34ed321967cdbe67b29ddcd732b591d051
%global openj9_branch v0.32.0-release
%global openj9_tag openj9-0.32.0
%global freemarker_version 2.3.29
%global openj9_revision 04a55b45b3a0d75813335fda0fb8703819690ee7
%global openj9_branch v0.33.0-release
%global openj9_tag openj9-0.33.0
%global java_atk_wrapper_version 0.33.2
# priority must be 6 digits in total
%if 0%{?suse_version} > 1500 || 0%{?java_bootstrap}
@ -97,11 +96,6 @@ URL: https://openjdk.java.net/
Source0: %{root_repository}/%{root_revision}.zip
Source1: %{omr_repository}/%{omr_revision}.zip
Source2: %{openj9_repository}/%{openj9_revision}.zip
# Use the freemarker jar from maven central
Source3: https://repo1.maven.org/maven2/org/freemarker/freemarker/%{freemarker_version}/freemarker-%{freemarker_version}.jar
# Package also the sources
Source4: https://repo1.maven.org/maven2/org/freemarker/freemarker/%{freemarker_version}/freemarker-%{freemarker_version}-sources.jar
# Accessibility support
Source8: https://download.gnome.org/sources/java-atk-wrapper/0.33/java-atk-wrapper-%{java_atk_wrapper_version}.tar.xz
# Desktop files. Adapted from IcedTea.
Source11: jconsole.desktop.in
@ -119,6 +113,8 @@ Patch3: java-atk-wrapper-security.patch
Patch4: libdwarf-fix.patch
# Allow multiple initialization of PKCS11 libraries
Patch5: multiple-pkcs11-library-init.patch
# Fix narrowing conversion error
Patch6: openj9-no-narrowing.patch
# Fix: implicit-pointer-decl
Patch13: implicit-pointer-decl.patch
#
@ -397,6 +393,7 @@ rm -rvf src/java.desktop/share/native/liblcms/lcms2*
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch13 -p1
%if %{with_system_pcsc}
@ -420,6 +417,7 @@ cat %{SOURCE100} \
| sed "s/@OPENJ9_TAG@/%{openj9_tag}/g" \
| sed "s/@OPENJ9OMR_SHA@/%{omr_revision}/g" \
| sed "s/@OPENJDK_SHA@/%{root_revision}/g" \
| sed "s/@OPENSSL_SHA@//g" \
| patch -p1 -u -l
# Prepare desktop files
@ -476,8 +474,8 @@ bash configure \
--with-extra-cxxflags="$EXTRA_CPP_FLAGS" \
--with-extra-cflags="$EXTRA_CFLAGS" \
--disable-javac-server \
--enable-demos \
--with-freemarker-jar=%{SOURCE3}
--enable-jitserver \
--enable-demos
make \
LOG=trace \
@ -827,6 +825,7 @@ fi
%{_jvmprivdir}/*
%{_jvmdir}/%{sdkdir}/bin/java
%{_jvmdir}/%{sdkdir}/bin/jitserver
%{_jvmdir}/%{sdkdir}/bin/keytool
%{_jvmdir}/%{sdkdir}/bin/rmiregistry
%{_jvmdir}/%{sdkdir}/conf/logging.properties
@ -837,6 +836,7 @@ fi
%{_jvmdir}/%{sdkdir}/conf/sdp/sdp.conf.template
%{_jvmdir}/%{sdkdir}/conf/security/java.policy
%{_jvmdir}/%{sdkdir}/conf/security/java.security
%{_jvmdir}/%{sdkdir}/conf/security/nss.fips.cfg
%{_jvmdir}/%{sdkdir}/conf/security/policy/limited/default_local.policy
%{_jvmdir}/%{sdkdir}/conf/security/policy/limited/default_US_export.policy
%{_jvmdir}/%{sdkdir}/conf/security/policy/limited/exempt_local.policy

21
openj9-no-narrowing.patch Normal file
View File

@ -0,0 +1,21 @@
--- a/openj9/runtime/compiler/env/j9methodServer.cpp
+++ b/openj9/runtime/compiler/env/j9methodServer.cpp
@@ -2634,7 +2634,7 @@ TR_ResolvedRelocatableJ9JITServerMethod::validateMethodFieldAttributes(const TR_
return equal;
}
-TR_J9ServerMethod::TR_J9ServerMethod(TR_FrontEnd * fe, TR_Memory * trMemory, J9Class * aClazz, uintptr_t cpIndex)
+TR_J9ServerMethod::TR_J9ServerMethod(TR_FrontEnd * fe, TR_Memory * trMemory, J9Class * aClazz, int32_t cpIndex)
: TR_J9Method()
{
TR_ASSERT(cpIndex != -1, "cpIndex shouldn't be -1");
--- a/openj9/runtime/compiler/env/j9methodServer.hpp
+++ b/openj9/runtime/compiler/env/j9methodServer.hpp
@@ -326,6 +326,6 @@ protected:
class TR_J9ServerMethod : public TR_J9Method
{
public:
- TR_J9ServerMethod(TR_FrontEnd *trvm, TR_Memory *, J9Class * aClazz, uintptr_t cpIndex);
+ TR_J9ServerMethod(TR_FrontEnd *trvm, TR_Memory *, J9Class * aClazz, int32_t cpIndex);
};
#endif // J9METHODSERVER_H

56
openj9-nogit.patch.in
View File

@ -1,43 +1,43 @@
diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk
index 8b7990a0cb..8559b989a0 100644
--- a/closed/OpenJ9.gmk
+++ b/closed/OpenJ9.gmk
@@ -32,20 +32,20 @@ ifeq (,$(BUILD_ID))
BUILD_ID := 000000
endif
@@ -40,11 +40,11 @@ VersionPairs :=
# ----------
# $1 - repository display name
# $2 - variable name
-# $3 - root directory of git repository
+# $3 - variable value
# $4 - 'required' for a required repository, anything else for an optional one
GetVersion = $(eval $(call GetVersionHelper,$(strip $1),$(strip $2),$(strip $3),$(strip $4)))
define GetVersionHelper
- $2 := $$(if $(wildcard $3),$$(shell $(GIT) -C $3 rev-parse --short HEAD))
+ $2 := $3
ifneq (,$$($2))
VersionLabelWidth := $(shell $(ECHO) "$1" | $(AWK) "{ width = length; print (width > $(VersionLabelWidth) ? width : $(VersionLabelWidth)) }")
VersionPairs += "$1" "$$($2)"
@@ -60,17 +60,17 @@ define ShowVersions
@$(PRINTF) " %-$(VersionLabelWidth)s - %s\n" $(VersionPairs)
endef # ShowVersions
-OPENJDK_SHA := $(shell $(GIT) -C $(TOPDIR) rev-parse --short HEAD)
+OPENJDK_SHA := @OPENJDK_SHA@
ifeq (,$(OPENJDK_SHA))
$(error Could not determine OpenJDK SHA)
endif
-OPENJ9_SHA := $(shell $(GIT) -C $(OPENJ9_TOPDIR) rev-parse --short HEAD)
+OPENJ9_SHA := @OPENJ9_SHA@
ifeq (,$(OPENJ9_SHA))
$(error Could not determine OpenJ9 SHA)
endif
-$(call GetVersion, openjdk, OPENJDK_SHA, $(TOPDIR), required)
-$(call GetVersion, openj9, OPENJ9_SHA, $(OPENJ9_TOPDIR), required)
-$(call GetVersion, omr, OPENJ9OMR_SHA, $(OPENJ9OMR_TOPDIR), required)
-$(call GetVersion, openssl, OPENSSL_SHA, $(OPENSSL_DIR))
+$(call GetVersion, openjdk, OPENJDK_SHA, @OPENJDK_SHA@, required)
+$(call GetVersion, openj9, OPENJ9_SHA, @OPENJ9_SHA@, required)
+$(call GetVersion, omr, OPENJ9OMR_SHA, @OPENJ9OMR_SHA@, required)
+$(call GetVersion, openssl, OPENSSL_SHA, @OPENSSL_SHA@ )
# Find OpenJ9 tag associated with current commit (suppressing stderr in case there is no such tag).
-OPENJ9_TAG := $(shell $(GIT) -C $(OPENJ9_TOPDIR) describe --exact-match HEAD 2>/dev/null)
+OPENJ9_TAG := @OPENJ9_TAG@
ifeq (,$(OPENJ9_TAG))
ifneq (,$(OPENJ9_TAG))
OPENJ9_VERSION_STRING := $(OPENJ9_TAG)
else
- OPENJ9_BRANCH := $(shell $(GIT) -C $(OPENJ9_TOPDIR) rev-parse --abbrev-ref HEAD)
+ OPENJ9_BRANCH := @OPENJ9_BRANCH@
ifeq (,$(OPENJ9_BRANCH))
$(error Could not determine OpenJ9 branch)
endif
@@ -54,7 +54,7 @@ else
OPENJ9_VERSION_STRING := $(OPENJ9_TAG)
endif
-OPENJ9OMR_SHA := $(shell $(GIT) -C $(OPENJ9OMR_TOPDIR) rev-parse --short HEAD)
+OPENJ9OMR_SHA := @OPENJ9OMR_SHA@
ifeq (,$(OPENJ9OMR_SHA))
$(error Could not determine OMR SHA)
endif
diff --git a/closed/custom/ReleaseFile.gmk b/closed/custom/ReleaseFile.gmk
index 8512c7702f..767b199992 100644
--- a/closed/custom/ReleaseFile.gmk
+++ b/closed/custom/ReleaseFile.gmk
@@ -18,6 +18,6 @@