Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package java-1_8_0-openj9 for openSUSE:Factory checked in at 2025-09-24 17:12:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_8_0-openj9 (Old) and /work/SRC/openSUSE:Factory/.java-1_8_0-openj9.new.27445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_8_0-openj9" Wed Sep 24 17:12:43 2025 rev:34 rq:1306918 version:1.8.0.462 Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_8_0-openj9/java-1_8_0-openj9.changes 2025-07-27 16:27:32.232892734 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_8_0-openj9.new.27445/java-1_8_0-openj9.changes 2025-09-24 17:12:44.182740737 +0200 @@ -1,0 +2,13 @@ +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 + +------------------------------------------------------------------- +Sat Aug 30 15:07:10 UTC 2025 - Fridrich Strba <[email protected]> + +- Remove pack200 and unpack200 from alternatives + +------------------------------------------------------------------- Old: ---- java-1_8_0-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-1_8_0-openj9.spec ++++++ --- /var/tmp/diff_new_pack.ShrpPi/_old 2025-09-24 17:12:45.854811061 +0200 +++ /var/tmp/diff_new_pack.ShrpPi/_new 2025-09-24 17:12:45.854811061 +0200 @@ -1,7 +1,7 @@ # # spec file for package java-1_8_0-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 @@ -85,6 +85,9 @@ %global imagestarget images %endif %global bits 64 +%if 0%{?gcc_version} < 7 +%define with_gcc 7 +%endif Name: java-1_8_0-openj9 Version: %{javaver}.%{updatever} Release: 0 @@ -102,7 +105,6 @@ # Ensure we aren't using the limited crypto policy Source14: TestCryptoLevel.java Source100: openj9-nogit.patch.in -Source1000: %{name}-rpmlintrc # RPM/distribution specific patches # Restrict access to java-atk-wrapper classes Patch1: java-atk-wrapper-security.patch @@ -110,6 +112,8 @@ Patch2: multiple-pkcs11-library-init.patch # Disable doclint for compatibility Patch3: disable-doclint-by-default.patch +# Fix build with libdwarf 2.x +Patch4: omr-libdwarf-2.patch # Patches for system libraries Patch201: system-libjpeg.patch Patch202: system-libpng.patch @@ -127,6 +131,8 @@ BuildRequires: fdupes BuildRequires: fontconfig BuildRequires: freetype2-devel +BuildRequires: gcc%{?with_gcc} +BuildRequires: gcc%{?with_gcc}-c++ BuildRequires: giflib-devel BuildRequires: gtk2-devel BuildRequires: java-ca-certificates @@ -190,13 +196,6 @@ Provides: jre1.7.x Provides: jre1.8.x ExclusiveArch: x86_64 ppc64le s390x aarch64 -%if 0%{?suse_version} < 1500 -BuildRequires: gcc7 -BuildRequires: gcc7-c++ -%else -BuildRequires: gcc >= 7 -BuildRequires: gcc-c++ >= 7 -%endif %if %{bootcycle} BuildRequires: java-devel >= 1.7 BuildConflicts: java >= 1.9 @@ -353,6 +352,7 @@ %patch -P 1 -p1 %patch -P 2 -p1 %patch -P 3 -p1 +%patch -P 4 -p1 cat %{SOURCE100} \ | sed "s/@OPENJ9_SHA@/`expr substr '%{openj9_revision}' 1 7`/g" \ @@ -390,11 +390,11 @@ %endif bash configure \ -%if 0%{?suse_version} < 1500 - CPP=cpp-7 \ - CXX=g++-7 \ - CC=gcc-7 \ - NM=gcc-nm-7 \ +%if 0%{?with_gcc} + CPP=cpp-%{with_gcc} \ + CXX=g++-%{with_gcc} \ + CC=gcc-%{with_gcc} \ + NM=gcc-nm-%{with_gcc} \ %endif --with-extra-cflags="$EXTRA_CFLAGS" \ --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \ @@ -650,8 +650,6 @@ --slave %{_bindir}/rmiregistry rmiregistry %{jrebindir}/rmiregistry \ --slave %{_bindir}/servertool servertool %{jrebindir}/servertool \ --slave %{_bindir}/tnameserv tnameserv %{jrebindir}/tnameserv \ - --slave %{_bindir}/pack200 pack200 %{jrebindir}/pack200 \ - --slave %{_bindir}/unpack200 unpack200 %{jrebindir}/unpack200 \ --slave %{_mandir}/man1/java.1$ext java.1$ext \ %{_mandir}/man1/java-%{sdklnk}.1$ext \ --slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \ @@ -668,10 +666,6 @@ %{_mandir}/man1/servertool-%{sdklnk}.1$ext \ --slave %{_mandir}/man1/tnameserv.1$ext tnameserv.1$ext \ %{_mandir}/man1/tnameserv-%{sdklnk}.1$ext \ - --slave %{_mandir}/man1/pack200.1$ext pack200.1$ext \ - %{_mandir}/man1/pack200-%{sdklnk}.1$ext \ - --slave %{_mandir}/man1/unpack200.1$ext unpack200.1$ext \ - %{_mandir}/man1/unpack200-%{sdklnk}.1$ext \ --slave %{_datadir}/applications/policytool.desktop policytool.desktop \ %{_jvmdir}/%{jredir}/lib/desktop/policytool.desktop \ || : ++++++ 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) */
