From b5b428f452f023ed266c6cfc6496a0d36a0fa670f855be1a4f71097b5f843c3d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 14 May 2021 06:11:46 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openj9?expand=0&rev=44 --- 162e6f729733666e22726ce5326f5982bb030330.zip | 3 + 2a5e26881428745325f8ebc14e1abd34edb9bd81.zip | 3 + 345e1b09e2a1f2cf6323b25edc901cce197f4365.zip | 3 - 741e94ea8673b021fc7edc59a2ec8bd203fa2b03.zip | 3 - ab07c6a8fd534eb77c4946e4546e659f8f043b8b.zip | 3 - b4cc246d9d2362346bc567861e6e0e536da3f390.zip | 3 + java-1_8_0-openj9.spec | 30 ++++---- maybe-uninitialized.patch | 81 ++++++++++++++++++++ 8 files changed, 106 insertions(+), 23 deletions(-) create mode 100644 162e6f729733666e22726ce5326f5982bb030330.zip create mode 100644 2a5e26881428745325f8ebc14e1abd34edb9bd81.zip delete mode 100644 345e1b09e2a1f2cf6323b25edc901cce197f4365.zip delete mode 100644 741e94ea8673b021fc7edc59a2ec8bd203fa2b03.zip delete mode 100644 ab07c6a8fd534eb77c4946e4546e659f8f043b8b.zip create mode 100644 b4cc246d9d2362346bc567861e6e0e536da3f390.zip create mode 100644 maybe-uninitialized.patch diff --git a/162e6f729733666e22726ce5326f5982bb030330.zip b/162e6f729733666e22726ce5326f5982bb030330.zip new file mode 100644 index 0000000..188181b --- /dev/null +++ b/162e6f729733666e22726ce5326f5982bb030330.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad76d62cb51e0445b59e224294f840c30cc81b1cb9e9c9b47668108adb252088 +size 10872123 diff --git a/2a5e26881428745325f8ebc14e1abd34edb9bd81.zip b/2a5e26881428745325f8ebc14e1abd34edb9bd81.zip new file mode 100644 index 0000000..c15347b --- /dev/null +++ b/2a5e26881428745325f8ebc14e1abd34edb9bd81.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ec483f2737c9fb03ae7e47843be00945446f03e7acc82778ae5f7857fabc1ea +size 126193500 diff --git a/345e1b09e2a1f2cf6323b25edc901cce197f4365.zip b/345e1b09e2a1f2cf6323b25edc901cce197f4365.zip deleted file mode 100644 index 122a610..0000000 --- a/345e1b09e2a1f2cf6323b25edc901cce197f4365.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:36833bb67f51baadd801e53c599ecf8e8c6f3c6ff80015586921bb60c3769769 -size 26833967 diff --git a/741e94ea8673b021fc7edc59a2ec8bd203fa2b03.zip b/741e94ea8673b021fc7edc59a2ec8bd203fa2b03.zip deleted file mode 100644 index 71d6e70..0000000 --- a/741e94ea8673b021fc7edc59a2ec8bd203fa2b03.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5420ebe7fc3c0d28241afeec620c35dd77ca85264cf2ecf7c802c55b566198f9 -size 10811199 diff --git a/ab07c6a8fd534eb77c4946e4546e659f8f043b8b.zip b/ab07c6a8fd534eb77c4946e4546e659f8f043b8b.zip deleted file mode 100644 index b386709..0000000 --- a/ab07c6a8fd534eb77c4946e4546e659f8f043b8b.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3eff834139be151576bc3257e1835faf5dd0178b5b1ed0bad0a70916b5679a8 -size 125901812 diff --git a/b4cc246d9d2362346bc567861e6e0e536da3f390.zip b/b4cc246d9d2362346bc567861e6e0e536da3f390.zip new file mode 100644 index 0000000..fc8f274 --- /dev/null +++ b/b4cc246d9d2362346bc567861e6e0e536da3f390.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1b819df4df187a1d0f860088def9aaa4a782f1e2fc39c9db207811380115db1 +size 27231206 diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec index c02fd3e..b494c37 100644 --- a/java-1_8_0-openj9.spec +++ b/java-1_8_0-openj9.spec @@ -25,18 +25,18 @@ %global abs2rel perl -e %{script} %global syslibdir %{_libdir} # Standard JPackage naming and versioning defines. -%global updatever 282 -%global buildver b08 +%global updatever 222 +%global buildver b10 %global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk8/archive -%global root_revision ab07c6a8fd534eb77c4946e4546e659f8f043b8b -%global root_branch openj9-0.24.0 +%global root_revision 2a5e26881428745325f8ebc14e1abd34edb9bd81 +%global root_branch openj9-0.26.0 %global omr_repository https://github.com/eclipse/openj9-omr/archive -%global omr_revision 741e94ea8673b021fc7edc59a2ec8bd203fa2b03 -%global omr_branch v0.24.0-release +%global omr_revision 162e6f729733666e22726ce5326f5982bb030330 +%global omr_branch v0.26.0-release %global openj9_repository https://github.com/eclipse/openj9/archive -%global openj9_revision 345e1b09e2a1f2cf6323b25edc901cce197f4365 -%global openj9_branch v0.24.0-release -%global openj9_tag openj9-0.24.0 +%global openj9_revision b4cc246d9d2362346bc567861e6e0e536da3f390 +%global openj9_branch v0.26.0-release +%global openj9_tag openj9-0.26.0 %global icedtea_sound_version 1.0.1 %global freemarker_version 2.3.29 # priority must be 6 digits in total @@ -128,6 +128,7 @@ Patch205: link-with-as-needed.patch Patch210: openj9-no-werror.patch Patch211: omr-no-return-in-nonvoid-function.patch +Patch212: maybe-uninitialized.patch Patch300: alternative-path-to-tzdb_dat.patch @@ -135,6 +136,7 @@ BuildRequires: alsa-lib-devel BuildRequires: autoconf BuildRequires: automake BuildRequires: binutils +BuildRequires: cmake BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -142,7 +144,6 @@ BuildRequires: fontconfig BuildRequires: freetype2-devel BuildRequires: gcc-c++ BuildRequires: giflib-devel -BuildRequires: git BuildRequires: gtk2-devel BuildRequires: java-ca-certificates BuildRequires: libX11-devel @@ -234,7 +235,7 @@ Requires: jpackage-utils # Post requires update-alternatives to install tool update-alternatives. Requires(post): update-alternatives # Postun requires update-alternatives to uninstall tool update-alternatives. -Requires(postun): update-alternatives +Requires(postun):update-alternatives Recommends: tzdata-java8 # Standard JPackage base provides. Provides: java-%{javaver}-headless = %{version}-%{release} @@ -272,7 +273,7 @@ Requires: %{name} = %{version}-%{release} # Post requires update-alternatives to install tool update-alternatives. Requires(post): update-alternatives # Postun requires update-alternatives to uninstall tool update-alternatives. -Requires(postun): update-alternatives +Requires(postun):update-alternatives # Standard JPackage devel provides. Provides: java-%{javaver}-devel = %{version} Provides: java-devel = %{javaver} @@ -313,7 +314,7 @@ Requires: jpackage-utils # Post requires update-alternatives to install javadoc alternative. Requires(post): update-alternatives # Postun requires update-alternatives to uninstall javadoc alternative. -Requires(postun): update-alternatives +Requires(postun):update-alternatives # Standard JPackage javadoc provides. Provides: java-%{javaver}-javadoc = %{version}-%{release} Provides: java-javadoc = %{version}-%{release} @@ -370,6 +371,7 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2* %patch210 %patch211 +%patch212 -p1 %patch1 -p1 %patch2 -p1 @@ -895,7 +897,7 @@ fi %dir %{_jvmdir}/%{jredir}/bin %dir %{_jvmdir}/%{jredir}/lib %dir %{_jvmdir}/%{jredir}/lib/%{archinstall} -%dir %{_jvmdir}/%{jredir}/lib/%{archinstall}/compressedrefs +%dir %{_jvmdir}/%{jredir}/lib/%{archinstall}/default %dir %{_jvmdir}/%{jredir}/lib/%{archinstall}/jli %dir %{_jvmdir}/%{jredir}/lib/%{archinstall}/j9vm %dir %{_jvmdir}/%{jredir}/lib/%{archinstall}/server diff --git a/maybe-uninitialized.patch b/maybe-uninitialized.patch new file mode 100644 index 0000000..4c87345 --- /dev/null +++ b/maybe-uninitialized.patch @@ -0,0 +1,81 @@ +--- a/openj9/openj9/runtime/gc_structs/MixedObjectIterator.hpp ++++ b/openj9/runtime/gc_structs/MixedObjectIterator.hpp +@@ -234,7 +234,7 @@ public: + /** + * @param vm[in] pointer to the JVM + */ +- GC_MixedObjectIterator (OMR_VM *omrVM) ++ GC_MixedObjectIterator(OMR_VM *omrVM) + : _slotObject(GC_SlotObject(omrVM, NULL)) + #if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) + , _compressObjectReferences(OMRVM_COMPRESS_OBJECT_REFERENCES(omrVM)) +@@ -251,20 +251,11 @@ public: + * @param vm[in] pointer to the JVM + * @param objectPtr[in] the object to be processed + */ +- GC_MixedObjectIterator (OMR_VM *omrVM, J9Object *objectPtr) +- : _slotObject(GC_SlotObject(omrVM, NULL)) +-#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) +- , _compressObjectReferences(OMRVM_COMPRESS_OBJECT_REFERENCES(omrVM)) +-#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */ +- , _objectPtr(NULL) +- , _scanPtr(NULL) +- , _endPtr(NULL) +- , _descriptionPtr(NULL) +- , _description(0) +- , _descriptionIndex(0) +- { ++ GC_MixedObjectIterator(OMR_VM *omrVM, J9Object *objectPtr) ++ : GC_MixedObjectIterator(omrVM) ++ { + initialize(omrVM, objectPtr); +- } ++ } + }; + + #endif /* MIXEDOBJECTITERATOR_HPP_ */ +--- a/openj9/openj9/runtime/gc_structs/PointerArrayIterator.hpp ++++ b/openj9/runtime/gc_structs/PointerArrayIterator.hpp +@@ -58,14 +58,12 @@ public: + * @param objectPtr the array object to be processed + */ + GC_PointerArrayIterator(J9JavaVM *javaVM, J9Object *objectPtr) +- : _contiguousArrayIterator(javaVM->omrVM) +- , _pointerArrayletIterator(javaVM) ++ : GC_PointerArrayIterator(javaVM) + { + initialize(javaVM, objectPtr); + } + + GC_PointerArrayIterator(J9JavaVM *javaVM) +- /* It is unnecessary to initialize one of those iterators */ + : _contiguousArrayIterator(javaVM->omrVM) + , _pointerArrayletIterator(javaVM) + { +--- a/openj9/openj9/runtime/gc_structs/PointerContiguousArrayIterator.hpp ++++ b/openj9/runtime/gc_structs/PointerContiguousArrayIterator.hpp +@@ -96,7 +96,10 @@ public: + } + + GC_PointerContiguousArrayIterator(OMR_VM *omrVM) +- : _slotObject(GC_SlotObject(omrVM, NULL)) ++ : _arrayPtr(NULL) ++ , _slotObject(GC_SlotObject(omrVM, NULL)) ++ , _scanPtr(NULL) ++ , _endPtr(NULL) + #if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) + , _compressObjectReferences(OMRVM_COMPRESS_OBJECT_REFERENCES(omrVM)) + #endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */ +@@ -108,11 +111,7 @@ public: + * @param objectPtr the array object to be processed + */ + GC_PointerContiguousArrayIterator(OMR_VM *omrVM, J9Object *objectPtr) +- : _slotObject(GC_SlotObject(omrVM, NULL)) +-#if defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) +- , _compressObjectReferences(OMRVM_COMPRESS_OBJECT_REFERENCES(omrVM)) +-#endif /* defined(OMR_GC_COMPRESSED_POINTERS) && defined(OMR_GC_FULL_POINTERS) */ +- , _omrVM(omrVM) ++ : GC_PointerContiguousArrayIterator(omrVM) + { + initialize(objectPtr); + }