Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package java-11-openj9 for openSUSE:Factory checked in at 2022-03-01 17:03:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-11-openj9 (Old) and /work/SRC/openSUSE:Factory/.java-11-openj9.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-11-openj9" Tue Mar 1 17:03:19 2022 rev:10 rq:957996 version:11.0.14.1 Changes: -------- --- /work/SRC/openSUSE:Factory/java-11-openj9/java-11-openj9.changes 2021-11-02 19:19:38.079105594 +0100 +++ /work/SRC/openSUSE:Factory/.java-11-openj9.new.1958/java-11-openj9.changes 2022-03-01 17:03:48.732337327 +0100 @@ -1,0 +2,14 @@ +Mon Feb 28 09:56:31 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Update to OpenJDK 11.0.14.1 with OpenJ9 0.30.1 virtual machine + * including Oracle January 2022 CPU changes (bsc#1194925, + bsc#1194926, bsc#1194927, bsc#1194928, bsc#1194929, bsc#1194930, + bsc#1194931, bsc#1194932, bsc#1194933, bsc#1194934, bsc#1194935, + bsc#1194937, bsc#1194939, bsc#1194940, bsc#1194941) + * OpenJ9 changes see + https://www.eclipse.org/openj9/docs/version0.30.1 +- Added patch: + * libdwarf-fix.patch + + fix build with different versions of libdwarf + +------------------------------------------------------------------- @@ -4 +18 @@ -- Update to OpenJDK 11.0.11 with OpenJ9 0.29.0 virtual machine +- Update to OpenJDK 11.0.13 with OpenJ9 0.29.0 virtual machine Old: ---- 299b6a2d28cf992edf57ca43b67ed6d6917675bf.zip 2d83aa3b76142e7dd319dc7dadea5ce310aeedf3.zip e1e72c497688c765183573526f7418a6fe891e93.zip New: ---- 56c3376ba057f905dc2ccd38fb4056d33f9e1f7c.zip 5c423dacd0765ed9fdbef0133193e10119f0d240.zip 9dccbe076db9055f4020bae78513f52c02572ba4.zip libdwarf-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-11-openj9.spec ++++++ --- /var/tmp/diff_new_pack.DuK1D2/_old 2022-03-01 17:03:51.556338076 +0100 +++ /var/tmp/diff_new_pack.DuK1D2/_new 2022-03-01 17:03:51.560338077 +0100 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,20 +29,20 @@ # Standard JPackage naming and versioning defines. %global featurever 11 %global interimver 0 -%global updatever 13 -%global patchver 0 -%global datever 2021-10-19 -%global buildver 8 +%global updatever 14 +%global patchver 1 +%global datever 2022-02-08 +%global buildver 1 %global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk11/archive -%global root_revision 2d83aa3b76142e7dd319dc7dadea5ce310aeedf3 -%global root_branch v0.29.0-release +%global root_revision 5c423dacd0765ed9fdbef0133193e10119f0d240 +%global root_branch v0.30.1-release %global omr_repository https://github.com/eclipse/openj9-omr/archive -%global omr_revision 299b6a2d28cf992edf57ca43b67ed6d6917675bf -%global omr_branch v0.29.0-release +%global omr_revision 56c3376ba057f905dc2ccd38fb4056d33f9e1f7c +%global omr_branch v0.30.1-release %global openj9_repository https://github.com/eclipse/openj9/archive -%global openj9_revision e1e72c497688c765183573526f7418a6fe891e93 -%global openj9_branch v0.29.0-release -%global openj9_tag openj9-0.29.0 +%global openj9_revision 9dccbe076db9055f4020bae78513f52c02572ba4 +%global openj9_branch v0.30.1-release +%global openj9_tag openj9-0.30.1 %global freemarker_version 2.3.29 # JavaEE modules %global java_atk_wrapper_version 0.33.2 @@ -143,6 +143,8 @@ Source100: openj9-nogit.patch.in # Restrict access to java-atk-wrapper classes Patch3: java-atk-wrapper-security.patch +# Allow building with newer libdwarf +Patch4: libdwarf-fix.patch # Allow multiple initialization of PKCS11 libraries Patch5: multiple-pkcs11-library-init.patch # Fix: implicit-pointer-decl @@ -429,6 +431,7 @@ rm -rvf src/java.desktop/share/native/liblcms/lcms2* %patch3 -p1 +%patch4 -p1 %patch5 -p1 %patch13 -p1 @@ -513,6 +516,7 @@ --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \ --with-extra-cflags="$EXTRA_CFLAGS" \ --disable-javac-server \ + --enable-demos \ --with-freemarker-jar=%{SOURCE3} make \ @@ -936,8 +940,6 @@ %{_mandir}/man1/jdb-%{sdklnk}.1$ext \ --slave %{_mandir}/man1/jdeps.1$ext jdeps.1$ext \ %{_mandir}/man1/jdeps-%{sdklnk}.1$ext \ - --slave %{_mandir}/man1/jmap.1$ext jmap.1$ext \ - %{_mandir}/man1/jmap-%{sdklnk}.1$ext \ --slave %{_mandir}/man1/jrunscript.1$ext jrunscript.1$ext \ %{_mandir}/man1/jrunscript-%{sdklnk}.1$ext \ --slave %{_mandir}/man1/rmic.1$ext rmic.1$ext \ @@ -1111,7 +1113,7 @@ %{_jvmdir}/%{sdkdir}/lib/*/libjsig.so %{_jvmdir}/%{sdkdir}/lib/*/libjvm.so -%config(noreplace) %{_jvmdir}/%{sdkdir}/lib/security/blacklisted.certs +%config(noreplace) %{_jvmdir}/%{sdkdir}/lib/security/blocked.certs %config(noreplace) %{_jvmdir}/%{sdkdir}/lib/security/nss.cfg %{_jvmdir}/%{sdkdir}/lib/security/default.policy %{_jvmdir}/%{sdkdir}/lib/security/public_suffix_list.dat @@ -1176,7 +1178,6 @@ %{_mandir}/man1/jconsole-%{sdklnk}.1%{?ext_man} %{_mandir}/man1/jdb-%{sdklnk}.1%{?ext_man} %{_mandir}/man1/jdeps-%{sdklnk}.1%{?ext_man} -%{_mandir}/man1/jmap-%{sdklnk}.1%{?ext_man} %{_mandir}/man1/jrunscript-%{sdklnk}.1%{?ext_man} %{_mandir}/man1/rmic-%{sdklnk}.1%{?ext_man} %{_mandir}/man1/serialver-%{sdklnk}.1%{?ext_man} ++++++ libdwarf-fix.patch ++++++ --- a/omr/ddr/lib/ddr-scanner/dwarf/DwarfScanner.cpp +++ b/omr/ddr/lib/ddr-scanner/dwarf/DwarfScanner.cpp @@ -1497,6 +1497,13 @@ DwarfScanner::traverse_cu_in_debug_section(Symbol_IR *ir) Dwarf_Half addressSize = 0; Dwarf_Unsigned nextCUheader = 0; Dwarf_Error error = NULL; +#ifdef DW_LIBDWARF_VERSION_MAJOR + Dwarf_Half lengthSize = 0; + Dwarf_Half extensionSize = 0; + Dwarf_Sig8 typeSignature; + Dwarf_Unsigned typeOffset = 0; + Dwarf_Half nextCUheaderType = 0; +#endif /* Go over each cu header. */ while (DDR_RC_OK == rc) { @@ -1504,7 +1511,11 @@ DwarfScanner::traverse_cu_in_debug_section(Symbol_IR *ir) _typeOffsetMap.clear(); _ir = &newIR; +#ifdef DW_LIBDWARF_VERSION_MAJOR + int ret = dwarf_next_cu_header_d(_debug, true, &cuHeaderLength, &versionStamp, &abbrevOffset, &addressSize, &lengthSize, &extensionSize, &typeSignature, &typeOffset, &nextCUheader, &nextCUheaderType, &error); +#else int ret = dwarf_next_cu_header(_debug, &cuHeaderLength, &versionStamp, &abbrevOffset, &addressSize, &nextCUheader, &error); +#endif if (DW_DLV_ERROR == ret) { ERRMSG("Failed to get next dwarf CU header."); rc = DDR_RC_ERROR; @@ -1518,7 +1529,11 @@ DwarfScanner::traverse_cu_in_debug_section(Symbol_IR *ir) Dwarf_Die childDie = NULL; /* Expect the CU to have a single sibling - a DIE */ +#ifdef DW_LIBDWARF_VERSION_MAJOR + if (DW_DLV_ERROR == dwarf_siblingof_b(_debug, NULL, true, &cuDie, &error)) { +#else if (DW_DLV_ERROR == dwarf_siblingof(_debug, NULL, &cuDie, &error)) { +#endif ERRMSG("Getting sibling of CU: %s\n", dwarf_errmsg(error)); rc = DDR_RC_ERROR; break; @@ -1617,12 +1632,20 @@ DwarfScanner::scanFile(OMRPortLibrary *portLibrary, Symbol_IR *ir, const char *f } if (DDR_RC_OK == rc) { +#ifdef DW_LIBDWARF_VERSION_MAJOR + unsigned int groupNumber = DW_GROUPNUMBER_ANY; +#else Dwarf_Unsigned access = DW_DLC_READ; +#endif Dwarf_Handler errhand = 0; Dwarf_Ptr errarg = NULL; intptr_t native_fd = omrfile_convert_omrfile_fd_to_native_fd(fd); DwarfScanner::scanFileName = filepath; +#ifdef DW_LIBDWARF_VERSION_MAJOR + res = dwarf_init_b((int)native_fd, groupNumber, errhand, errarg, &_debug, &error); +#else res = dwarf_init((int)native_fd, access, errhand, errarg, &_debug, &error); +#endif if (DW_DLV_OK != res) { ERRMSG("Failed to initialize libDwarf scanning %s: %s\nExiting...\n", filepath, dwarf_errmsg(error)); if (NULL != error) { @@ -1640,7 +1663,11 @@ DwarfScanner::scanFile(OMRPortLibrary *portLibrary, Symbol_IR *ir, const char *f DEBUGPRINTF("Unloading libDwarf"); +#ifdef DW_LIBDWARF_VERSION_MAJOR + res = dwarf_finish(_debug); +#else res = dwarf_finish(_debug, &error); +#endif if (DW_DLV_OK != res) { ERRMSG("Failed to Unload libDwarf: %s\nExiting...\n", dwarf_errmsg(error)); if (NULL != error) { @@ -1681,7 +1708,11 @@ DwarfScanner::getNextSibling(Dwarf_Die *die) Dwarf_Error err = NULL; /* Get the next sibling and free the previous one if successful. */ +#ifdef DW_LIBDWARF_VERSION_MAJOR + int ret = dwarf_siblingof_b(_debug, *die, true, &nextSibling, &err); +#else int ret = dwarf_siblingof(_debug, *die, &nextSibling, &err); +#endif if (DW_DLV_ERROR == ret) { ERRMSG("Getting sibling of die:%s\n", dwarf_errmsg(err)); } else if (DW_DLV_OK == ret) {
