Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package java-21-openj9 for openSUSE:Factory checked in at 2025-09-24 17:12:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-21-openj9 (Old) and /work/SRC/openSUSE:Factory/.java-21-openj9.new.27445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-21-openj9" Wed Sep 24 17:12:56 2025 rev:12 rq:1306924 version:21.0.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/java-21-openj9/java-21-openj9.changes 2025-07-27 16:27:26.548658135 +0200 +++ /work/SRC/openSUSE:Factory/.java-21-openj9.new.27445/java-21-openj9.changes 2025-09-24 17:12:57.291292055 +0200 @@ -1,0 +2,8 @@ +Wed Sep 24 07:27:32 UTC 2025 - Fridrich Strba <[email protected]> + +- Added patch: + * omr-libdwarf-2.patch + + fix build with libdwarf 2.x where the includes are in + libdwarf-2 subdirectory + +------------------------------------------------------------------- Old: ---- java-21-openj9-rpmlintrc New: ---- omr-libdwarf-2.patch ----------(New B)---------- New:- Added patch: * omr-libdwarf-2.patch + fix build with libdwarf 2.x where the includes are in ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-21-openj9.spec ++++++ --- /var/tmp/diff_new_pack.BWSLdK/_old 2025-09-24 17:12:59.363379203 +0200 +++ /var/tmp/diff_new_pack.BWSLdK/_new 2025-09-24 17:12:59.363379203 +0200 @@ -1,7 +1,7 @@ # # spec file for package java-21-openj9 # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -107,7 +107,6 @@ # Ensure ECDSA is working Source15: TestECDSA.java Source100: openj9-nogit.patch.in -Source1000: %{name}-rpmlintrc # Restrict access to java-atk-wrapper classes Patch1: java-atk-wrapper-security.patch # Allow multiple initialization of PKCS11 libraries @@ -118,6 +117,8 @@ # Fix: implicit-pointer-decl Patch5: implicit-pointer-decl.patch # +Patch6: omr-libdwarf-2.patch +# Patch10: system-pcsclite.patch # Patch20: loadAssistiveTechnologies.patch @@ -344,7 +345,7 @@ The OpenJDK %{featurever} API documentation. %prep -%setup -q -n openj9-openjdk-jdk21-%{root_revision} -a 1 -a 2 +%setup -q -n openj9-openjdk-jdk%{featurever}-%{root_revision} -a 1 -a 2 # Set up the build tree using the subrepository tarballs pwd @@ -366,6 +367,7 @@ %patch -P 3 -p1 %patch -P 4 -p1 %patch -P 5 -p1 +%patch -P 6 -p1 %if %{with_system_pcsc} %patch -P 10 -p1 ++++++ omr-libdwarf-2.patch ++++++ --- a/omr/cmake/modules/FindLibDwarf.cmake +++ b/omr/cmake/modules/FindLibDwarf.cmake @@ -62,6 +62,16 @@ if(LIBDWARF_0_DWARF_H_INCLUDE_DIR) set(DWARF_H_FOUND true) endif() +if(NOT DWARF_H_FOUND) + find_path(LIBDWARF_2_DWARF_H_INCLUDE_DIR "libdwarf-2/dwarf.h") + + if(LIBDWARF_2_DWARF_H_INCLUDE_DIR) + list(APPEND DWARF_H_INCLUDE_DIRS "${LIBDWARF_2_DWARF_H_INCLUDE_DIR}") + list(APPEND DWARF_H_DEFINITIONS HAVE_LIBDWARF_2_DWARF_H) + set(DWARF_H_FOUND true) + endif() +endif() + if(NOT DWARF_H_FOUND) find_path(LIBDWARF_DWARF_H_INCLUDE_DIR "libdwarf/dwarf.h") @@ -106,6 +116,16 @@ if(LIBDWARF_0_LIBDWARF_H_INCLUDE_DIR) set(LIBDWARF_H_FOUND true) endif() +if(NOT LIBDWARF_H_FOUND) + find_path(LIBDWARF_2_LIBDWARF_H_INCLUDE_DIR "libdwarf-2/libdwarf.h") + + if(LIBDWARF_2_LIBDWARF_H_INCLUDE_DIR) + list(APPEND LIBDWARF_H_INCLUDE_DIRS "${LIBDWARF_2_LIBDWARF_H_INCLUDE_DIR}") + list(APPEND LIBDWARF_H_DEFINITIONS HAVE_LIBDWARF_2_LIBDWARF_H) + set(LIBDWARF_H_FOUND true) + endif() +endif() + if(NOT LIBDWARF_H_FOUND) find_path(LIBDWARF_LIBDWARF_H_INCLUDE_DIR "libdwarf/libdwarf.h") --- a/omr/ddr/include/ddr/scanner/dwarf/DwarfScanner.hpp +++ b/omr/ddr/include/ddr/scanner/dwarf/DwarfScanner.hpp @@ -33,22 +33,26 @@ #if defined(HAVE_LIBDWARF_0_DWARF_H) #include <libdwarf-0/dwarf.h> -#elif defined(HAVE_LIBDWARF_DWARF_H) /* defined(HAVE_LIBDWARF_0_DWARF_H) */ +#elif defined(HAVE_LIBDWARF_2_DWARF_H) /* defined(HAVE_LIBDWARF_0_DWARF_H) */ +#include <libdwarf-2/dwarf.h> +#elif defined(HAVE_LIBDWARF_DWARF_H) /* defined(HAVE_LIBDWARF_2_DWARF_H) */ #include <libdwarf/dwarf.h> #elif defined(HAVE_DWARF_H) /* defined(HAVE_LIBDWARF_DWARF_H) */ #include <dwarf.h> #else /* defined(HAVE_DWARF_H) */ -#error "Need libdwarf-0/dwarf.h, libdwarf/dwarf.h or dwarf.h" +#error "Need libdwarf-0/dwarf.h, libdwarf-2/dwarf.h, libdwarf/dwarf.h or dwarf.h" #endif /* defined(HAVE_LIBDWARF_0_DWARF_H) */ #if defined(HAVE_LIBDWARF_0_LIBDWARF_H) #include <libdwarf-0/libdwarf.h> -#elif defined(HAVE_LIBDWARF_LIBDWARF_H) /* defined(HAVE_LIBDWARF_0_LIBDWARF_H) */ +#elif defined(HAVE_LIBDWARF_2_LIBDWARF_H) /* defined(HAVE_LIBDWARF_0_LIBDWARF_H) */ +#include <libdwarf-2/libdwarf.h> +#elif defined(HAVE_LIBDWARF_LIBDWARF_H) /* defined(HAVE_LIBDWARF_2_LIBDWARF_H) */ #include <libdwarf/libdwarf.h> #elif defined(HAVE_LIBDWARF_H) /* defined(HAVE_LIBDWARF_LIBDWARF_H) */ #include <libdwarf.h> #else /* defined(HAVE_LIBDWARF_H) */ -#error "Need libdwarf-0/libdwarf.h, libdwarf/libdwarf.h or libdwarf.h" +#error "Need libdwarf-0/libdwarf.h, libdwarf-2/libdwarf.h, libdwarf/libdwarf.h or libdwarf.h" #endif /* defined(HAVE_LIBDWARF_0_LIBDWARF_H) */ #endif /* defined(AIXPPC) || defined(OSX) */
