Add cppheaderparser support and fix python dependencies for SUSE

Signed-off-by: Egbert Eich <eich@suse.com>
2025-08-09 08:50:03 +02:00
10 changed files with 411 additions and 32 deletions
--- a/58
+++ b/58
@@ -0,0 +1,58 @@
+* Fri Oct 20 2023 Jeremy Newton <alexjnewt at hotmail dot com> - 5.7.1-1
+- Update to 5.7.1
+
+* Tue Oct 03 2023 Jeremy Newton <alexjnewt at hotmail dot com> - 5.7.0-1
+- Update to 5.7
+
+* Tue Sep 12 2023 Jeremy Newton <alexjnewt at hotmail dot com> - 5.6.1-1
+- Update to 5.6.1
+
+* Sun Aug 20 2023 Tom Rix <trix@redhat.com> - 5.6.0-4
+- A better fix for blender 3.6.x and rocFFT
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 04 2023 Jeremy Newton <alexjnewt at hotmail dot com> - 5.6.0-2
+- Fix missing requires on rocm-hip-devel package
+
+* Thu Jun 29 2023 Jeremy Newton <alexjnewt at hotmail dot com> - 5.6.0-1
+- Update to 5.6
+
+* Sun Jun 18 2023 Tom Rix <trix@redhat.com> - 5.5.1-9
+- Fix building upstream blender 3.5.x
+
+* Sat Jun 10 2023 Jeremy Newton <alexjnewt at hotmail dot com> - 5.5.1-8
+- Fix hip-lang-config.cmake bug (upstream patch)
+
+* Fri Jun 09 2023 Jeremy Newton <alexjnewt at hotmail dot com> - 5.5.1-7
+- Fix hip-config.cmake bug (upstream patch)
+
+* Fri Jun 02 2023 Jeremy Newton <alexjnewt at hotmail dot com> - 5.5.1-6
+- Fix rocminfo requires for hip
+
+* Tue May 30 2023 Jeremy Newton <alexjnewt at hotmail dot com> - 5.5.1-5
+- Move some sed patching to patch files, sent some to upstream
+- Add hipconfig patch for incorrect HIP_CLANG_INCLUDE detection
+- Using rocm-device-libs 16.2 simplifies hipcc patching
+- Minor clean up
+
+* Tue May 30 2023 Jeremy Newton <alexjnewt at hotmail dot com> - 5.5.1-4
+- Move libamdhip64.so to rocm-hip to workaround blender issue
+
+* Tue May 30 2023 Jeremy Newton <alexjnewt at hotmail dot com> - 5.5.1-3
+- Add "hip" runtime package; hipcc/hipconfig is required for blender at runtime
+
+* Tue May 30 2023 Jeremy Newton <alexjnewt at hotmail dot com> - 5.5.1-2
+- Add missing perl-generators for generating requires
+- Fix some issues with hipcc.pl
+- Add fix build for aarch64
+
+* Sun May 28 2023 Jeremy Newton <alexjnewt at hotmail dot com> - 5.5.1-1
+- Update to 5.5.1
+- Workaround RHBZ#2207599
+- Add noexecstack linker option
+- Add doxygen docs
+
+* Tue May 16 2023 Jeremy Newton <alexjnewt at hotmail dot com> - 5.5.0-1
+- Initial package
--- a/debian/README.txt
+++ b/debian/README.txt
@@ -0,0 +1,39 @@
+To generate a debian from fedora.
+
+1. Prepare the big patch
+On fedora do
+
+> rpmbuild -bp rocclr.spec
+
+This will produce something like
+
+~/rpmbuild/BUILD/rocclr-6.4.0-build/clr-rocm-6.4.0/
+
+Go to the dir and untar the original source 
+
+> cd ~/rpmbuild/BUILD/rocclr-6.4.0-build/
+> mkdir a
+> cd a
+> tar xf ../../../SOURCES/rocclr-6.4.0.tar.gz
+
+Now also untar HIP
+
+> cd clr-rocm-6.4.0/
+> tar xf ../../../../SOURCES/HIP-6.4.0.tar.gz
+
+This is the unmodified source, rename the dir
+
+> cd ..
+> mv clr-rocm-6.4.0 clr-rocm-6.4.0.orig
+
+copy the prep-ed source to same dir
+
+> cp -r ../clr-rocm-6.4.0 .
+
+Make the patch
+Ingored the removed opencl bits
+
+> diff -rup clr-rocm-6.4.0.orig clr-rocm-6.4.0 > patch.diff
+
+Copy this patch to debian/patches
+
--- a/debian/changelog
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+clr-rocm (6.4.0-1) UNRELEASED; urgency=medium
+
+  * Initial release. (Closes: #XXXXXX)
+
+ -- trix <Tom.Rix@amd.com>  Sat, 3 May 2025 05:09:24 -0800
--- a/debian/control
+++ b/debian/control
@@ -0,0 +1,19 @@
+Source: clr-rocm
+Maintainer: Tom Rix <Tom.Rix@amd.com>
+Uploaders: Tom Rix <Tom.Rix@amd.com>
+Section: devel
+Priority: optional
+Build-Depends: debhelper-compat (= 13),
+     cmake,
+     debhelper,
+     libelf-dev,
+     libnuma-dev,
+     libgl-dev,
+     rocm-llvm,
+     rocm-runtime
+
+Package: rocclr
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Description: ROCm CLR
--- a/debian/copyright
+++ b/debian/copyright
@@ -0,0 +1,4 @@
+Files:
+ *
+Copyright: 2025 AMD
+License: MIT
--- a/debian/patches/patch.diff
+++ b/debian/patches/patch.diff
@@ -0,0 +1,164 @@
+diff -rup clr-rocm-6.4.0.orig/hipamd/CMakeLists.txt clr-rocm-6.4.0/hipamd/CMakeLists.txt
+--- clr-rocm-6.4.0.orig/hipamd/CMakeLists.txt	2025-04-02 08:04:37.000000000 -0700
+++ clr-rocm-6.4.0/hipamd/CMakeLists.txt	2025-05-05 09:53:33.154953578 -0700
+@@ -413,15 +413,8 @@ install(FILES ${PROJECT_BINARY_DIR}/incl
+ if (NOT ${HIPCC_BIN_DIR} STREQUAL "")
+   file(TO_CMAKE_PATH "${HIPCC_BIN_DIR}" HIPCC_BIN_DIR)
+   if(EXISTS ${HIPCC_BIN_DIR})
+-    install(PROGRAMS ${HIPCC_BIN_DIR}/${HIPCC_EXECUTABLE} DESTINATION bin)
+-    install(PROGRAMS ${HIPCC_BIN_DIR}/${HIPCONFIG_EXECUTABLE} DESTINATION bin)
+-    install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.pl DESTINATION bin)
+-    install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.pl DESTINATION bin)
+-    install(PROGRAMS ${HIPCC_BIN_DIR}/hipvars.pm DESTINATION bin)
+ 
+     if(NOT UNIX)
+-      install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.bat DESTINATION bin)
+-      install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin)
+     endif()
+   endif()
+ endif()
+@@ -469,7 +462,7 @@ install(
+ # Packaging invokes UNIX commands, which are not available on Windows.
+ 
+ if(NOT WIN32)
+-    add_subdirectory(packaging)
+    #add_subdirectory(packaging)
+ endif()
+ 
+ #############################
+diff -rup clr-rocm-6.4.0.orig/hipamd/include/hip/amd_detail/amd_device_functions.h clr-rocm-6.4.0/hipamd/include/hip/amd_detail/amd_device_functions.h
+--- clr-rocm-6.4.0.orig/hipamd/include/hip/amd_detail/amd_device_functions.h	2025-04-02 08:04:37.000000000 -0700
+++ clr-rocm-6.4.0/hipamd/include/hip/amd_detail/amd_device_functions.h	2025-05-05 09:53:33.149953506 -0700
+@@ -71,6 +71,10 @@ __device__ static inline int __ffsll(uns
+     return ( input == 0 ? -1 : __builtin_ctzll(input) ) + 1;
+ }
+ 
+__device__ static inline unsigned int __ffsll(unsigned long int input) {
+    return ( input == 0 ? -1 : __builtin_ctzll(input) ) + 1;
+}
+
+ __device__ static inline int __ffs(int input) {
+     return ( input == 0 ? -1 : __builtin_ctz(input) ) + 1;
+ }
+@@ -79,6 +83,10 @@ __device__ static inline int __ffsll(lon
+     return ( input == 0 ? -1 : __builtin_ctzll(input) ) + 1;
+ }
+ 
+__device__ static inline unsigned int __ffsll(long int input) {
+    return ( input == 0 ? -1 : __builtin_ctzll(input) ) + 1;
+}
+
+ // Given a 32/64-bit value exec mask and an integer value base (between 0 and WAVEFRONT_SIZE),
+ // find the n-th (given by offset) set bit in the exec mask from the base bit, and return the bit position.
+ // If not found, return -1.
+diff -rup clr-rocm-6.4.0.orig/hipamd/src/CMakeLists.txt clr-rocm-6.4.0/hipamd/src/CMakeLists.txt
+--- clr-rocm-6.4.0.orig/hipamd/src/CMakeLists.txt	2025-04-02 08:04:37.000000000 -0700
+++ clr-rocm-6.4.0/hipamd/src/CMakeLists.txt	2025-05-05 09:53:33.154953578 -0700
+@@ -42,17 +42,11 @@ if(ADDRESS_SANITIZER)
+     endif()
+   endif()
+ 
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ASAN_COMPILER_FLAGS}")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ASAN_COMPILER_FLAGS}")
+   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${ASAN_LINKER_FLAGS} -s -Wl,--build-id=sha1")
+   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${ASAN_LINKER_FLAGS} -Wl,--build-id=sha1")
+ endif()
+ 
+ if(CMAKE_COMPILER_IS_GNUCC)
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=deprecated-declarations")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=deprecated-declarations")
+ endif()
+ 
+ option(DISABLE_DIRECT_DISPATCH "Disable Direct Dispatch" OFF)
+diff -rup clr-rocm-6.4.0.orig/hipamd/src/hiprtc/cmake/hiprtc-config.cmake.in clr-rocm-6.4.0/hipamd/src/hiprtc/cmake/hiprtc-config.cmake.in
+--- clr-rocm-6.4.0.orig/hipamd/src/hiprtc/cmake/hiprtc-config.cmake.in	2025-04-02 08:04:37.000000000 -0700
+++ clr-rocm-6.4.0/hipamd/src/hiprtc/cmake/hiprtc-config.cmake.in	2025-05-05 09:53:33.154948078 -0700
+@@ -18,7 +18,7 @@
+ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ # THE SOFTWARE.
+ 
+-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.5)
+ @PACKAGE_INIT@
+ include(CMakeFindDependencyMacro)
+ set_and_check(hiprtc_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+diff -rup clr-rocm-6.4.0.orig/opencl/amdocl/CMakeLists.txt clr-rocm-6.4.0/opencl/amdocl/CMakeLists.txt
+--- clr-rocm-6.4.0.orig/opencl/amdocl/CMakeLists.txt	2025-04-02 08:04:37.000000000 -0700
+++ clr-rocm-6.4.0/opencl/amdocl/CMakeLists.txt	2025-05-05 09:53:33.155823652 -0700
+@@ -133,3 +133,4 @@ INSTALL(TARGETS amdocl
+   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+set_target_properties(amdocl PROPERTIES VERSION 6.4.0 SOVERSION 6.4)
+diff -rup clr-rocm-6.4.0.orig/opencl/CMakeLists.txt clr-rocm-6.4.0/opencl/CMakeLists.txt
+--- clr-rocm-6.4.0.orig/opencl/CMakeLists.txt	2025-04-02 08:04:37.000000000 -0700
+++ clr-rocm-6.4.0/opencl/CMakeLists.txt	2025-05-05 09:53:33.176389570 -0700
+@@ -126,7 +126,7 @@ if(BUILD_ICD)
+   configure_file(packaging/rocm-ocl-icd.rpm_postun ${BUILD_DIR}/rpm_postun @ONLY)
+ endif()
+ 
+-add_subdirectory(packaging)
+#add_subdirectory(packaging)
+ 
+ #File reorg Backward compatibility function
+ if(FILE_REORG_BACKWARD_COMPATIBILITY)
+diff -rup clr-rocm-6.4.0.orig/opencl/config/amdocl64.icd clr-rocm-6.4.0/opencl/config/amdocl64.icd
+--- clr-rocm-6.4.0.orig/opencl/config/amdocl64.icd	2025-04-02 08:04:37.000000000 -0700
+++ clr-rocm-6.4.0/opencl/config/amdocl64.icd	2025-05-05 09:53:33.158303498 -0700
+@@ -1 +1 @@
+-libamdocl64.so
+libamdocl64.so.6.4
+Only in clr-rocm-6.4.0.orig/opencl/khronos/headers: EGL
+Only in clr-rocm-6.4.0.orig/opencl/khronos/headers: GL
+Only in clr-rocm-6.4.0.orig/opencl/khronos/headers: KHR
+Only in clr-rocm-6.4.0.orig/opencl/khronos/headers: opencl1.2
+Only in clr-rocm-6.4.0.orig/opencl/khronos/headers: opencl2.0
+Only in clr-rocm-6.4.0.orig/opencl/khronos/headers: opencl2.1
+Only in clr-rocm-6.4.0.orig/opencl/khronos: icd
+diff -rup clr-rocm-6.4.0.orig/opencl/tools/cltrace/CMakeLists.txt clr-rocm-6.4.0/opencl/tools/cltrace/CMakeLists.txt
+--- clr-rocm-6.4.0.orig/opencl/tools/cltrace/CMakeLists.txt	2025-04-02 08:04:37.000000000 -0700
+++ clr-rocm-6.4.0/opencl/tools/cltrace/CMakeLists.txt	2025-05-05 09:53:33.176389570 -0700
+@@ -15,3 +15,4 @@ INSTALL(TARGETS cltrace
+   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+set_target_properties(cltrace PROPERTIES VERSION 6.4.0 SOVERSION 6.4)
+diff -rup clr-rocm-6.4.0.orig/rocclr/device/comgrctx.cpp clr-rocm-6.4.0/rocclr/device/comgrctx.cpp
+--- clr-rocm-6.4.0.orig/rocclr/device/comgrctx.cpp	2025-04-02 08:04:37.000000000 -0700
+++ clr-rocm-6.4.0/rocclr/device/comgrctx.cpp	2025-05-05 09:53:33.180953954 -0700
+@@ -52,16 +52,16 @@ bool Comgr::LoadLib(bool is_versioned) {
+     comgr_versioned_name = kComgrPrefix + major_version + minor_version + std::string(".dll");
+ 
+     static const char* comgr_lib_name =
+-    LP64_SWITCH(WINDOWS_SWITCH("amd_comgr32.dll", "libamd_comgr32.so"),
+-                WINDOWS_SWITCH(comgr_versioned_name.c_str(), "libamd_comgr.so"));
+    LP64_SWITCH(WINDOWS_SWITCH("amd_comgr32.dll", "libamd_comgr32.so.3"),
+                WINDOWS_SWITCH(comgr_versioned_name.c_str(), "libamd_comgr.so.3"));
+     cep_.handle = Os::loadLibrary(comgr_lib_name);
+ #endif
+   } else {
+     std::string comgr_major_dll = "amd_comgr_" +
+                                   std::to_string(AMD_COMGR_INTERFACE_VERSION_MAJOR) + ".dll";
+     static const char* comgr_lib_name =
+-    LP64_SWITCH(WINDOWS_SWITCH("amd_comgr32.dll", "libamd_comgr32.so"),
+-                WINDOWS_SWITCH(comgr_major_dll.c_str(), "libamd_comgr.so"));
+    LP64_SWITCH(WINDOWS_SWITCH("amd_comgr32.dll", "libamd_comgr32.so.3"),
+                WINDOWS_SWITCH(comgr_major_dll.c_str(), "libamd_comgr.so.3"));
+     cep_.handle = Os::loadLibrary(comgr_lib_name);
+   }
+   if (nullptr == cep_.handle) {
+diff -rup clr-rocm-6.4.0.orig/rocclr/device/device.hpp clr-rocm-6.4.0/rocclr/device/device.hpp
+--- clr-rocm-6.4.0.orig/rocclr/device/device.hpp	2025-04-02 08:04:37.000000000 -0700
+++ clr-rocm-6.4.0/rocclr/device/device.hpp	2025-05-05 09:53:33.180953954 -0700
+@@ -1452,9 +1452,6 @@ class Isa {
+ 
+   /// @returns If the ROCm runtime supports the ISA.
+   bool runtimeRocSupported() const {
+-    if (!IS_HIP && (versionMajor_ == 8)) {
+-      return false;
+-    }
+     return runtimeRocSupported_;
+   }
+ 
--- a/debian/rocclr.install
+++ b/debian/rocclr.install
@@ -0,0 +1 @@
+/usr/*
--- a/debian/rules
+++ b/debian/rules
@@ -0,0 +1,69 @@
+#!/usr/bin/make -f
+
+build_tyle             := RelWithDebInfo
+cmake_install_libdir   := lib/x86_64-linux-gnu
+comgr_maj_api_ver      := 3
+deb_inst               := $(CURDIR)/debian/tmp/
+rocmllvm_bindir        := /usr/lib/rocm/llvm/bin
+rocmllvm_cmakedir      := /usr/lib/rocm/llvm/lib/cmake/llvm
+version                := 6.4.0
+
+
+%:
+	dh $@
+
+dirs:
+	- mkdir build
+
+override_dh_auto_configure:
+	PATH=$(rocmllvm_bindir):$$PATH \
+	cmake -S . -B build \
+		-DCMAKE_CXX_COMPILER=$(rocmllvm_bindir)/clang++ \
+		-DCMAKE_C_COMPILER=$(rocmllvm_bindir)/clang \
+		-DCMAKE_AR=$(rocmllvm_bindir)/llvm-ar \
+		-DCMAKE_RANLIB=$(rocmllvm_bindir)/llvm-ranlib \
+		-DCMAKE_LINKER=$(rocmllvm_bindir)/ld.lld \
+		-DHIP_COMMON_DIR=$(shell pwd)/hip-rocm-$(version) \
+		-DCMAKE_INSTALL_LIBDIR=$(cmake_install_libdir) \
+		-DHIPCC_BIN_DIR=/usr/bin \
+		-DHIP_COMPILER=$(rocmllvm_bindir)/clang++ \
+		-DHIP_PLATFORM=amd \
+		-DROCM_PATH=/usr \
+		-DBUILD_ICD=OFF \
+		-DCLR_BUILD_HIP=ON \
+		-DCLR_BUILD_OCL=OFF \
+		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF \
+		-DHIP_ENABLE_ROCPROFILER_REGISTER=OFF \
+		-DUSE_PROF_API=OFF \
+		-DCMAKE_PREFIX_PATH=$(rocmllvm_cmakedir)/.. \
+		-DCMAKE_BUILD_TYPE=$(build_type)
+
+override_dh_auto_build:
+	make -C build
+
+override_dh_auto_install:
+	DESTDIR=$(deb_inst) \
+	make -C build install
+
+override_dh_install:
+	dh_install
+	dh_missing --list-missing
+
+override_dh_auto_test:
+
+# No docs
+override_dh_installdocs:
+
+# Too many DIE's
+override_dh_dwz:
+
+clean:
+	rm -rf build
+	rm -rf $(deb_inst)
+	rm -rf debian/rocclr
+
+override_dh_auto_clean: clean
+
+override_dh_ocamlinit:
+override_dh_ocamlclean:
+override_dh_ocaml:
--- a/debian/setuptmp.sh
+++ b/debian/setuptmp.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# call from debian/
+set -x
+
+ver=6.4.0
+
+p=rocclr
+b=$HOME/b/$p
+if [ -d $b ]; then
+    rm -rf $b
+fi
+
+mkdir -p $HOME/b
+rsync -ar ../../$p $HOME/b
+
+cd $HOME/b/$p
+    
+tar xf ${p}-${ver}.tar.gz
+cd clr-rocm-${ver}
+tar xf ../HIP-${ver}.tar.gz
+cd ..
+tar cf clr-rocm_${ver}.orig.tar clr-rocm-${ver}
+gzip --fast clr-rocm_${ver}.orig.tar
+
+cd clr-rocm-${ver}
+patch -p1 < ../debian/patches/patch.diff
+
+mv  ../debian .
+
+
--- a/rocclr.spec
+++ b/rocclr.spec
@@ -1,24 +1,3 @@
-#
-# Copyright Fedora Project Authors.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#

 # ROCclr loads comgr at run time by soversion, so this needs to be checked when
 # updating this package as it's used for the comgr requires for opencl and hip:
@@ -41,7 +20,7 @@
 %global build_type RelWithDebInfo
 %endif

-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?suse_version}
 %bcond_without cppheaderparser
 %else
 %bcond_with cppheaderparser
@@ -81,7 +60,7 @@

 Name:           rocclr
 Version:        %{rocm_version}
-Release:        4%{?dist}
+Release:        3%{?dist}
 Summary:        ROCm Compute Language Runtime
 Url:            https://github.com/ROCm/clr
 License:        MIT
@@ -137,8 +116,12 @@ BuildRequires:  pkgconfig(ocl-icd)
 %endif
 BuildRequires:  pkgconfig(numa)
 %if %{with cppheaderparser}
+%if 0%{?suse_version}
+BuildRequires:  %{python_module CppHeaderParser}
+%else
 BuildRequires:  python3-cppheaderparser
 %endif
+%endif
 BuildRequires:  rocm-comgr-devel
 BuildRequires:  rocm-compilersupport-macros
 BuildRequires:  rocm-runtime-devel >= %{rocm_release}
@@ -344,10 +327,19 @@ rm %{buildroot}%{_libdir}/.hipInfo
 # Windows files:
 rm %{buildroot}%{_bindir}/*.bat

-rm -f %{buildroot}%{_prefix}/share/doc/packages/rocclr*/LICENSE.txt
-rm -f %{buildroot}%{_prefix}/share/doc/opencl*/LICENSE.txt
-rm -f %{buildroot}%{_prefix}/share/doc/hip-asan/LICENSE.txt
-rm -f %{buildroot}%{_prefix}/share/doc/hip/LICENSE.txt
+if [ -f %{buildroot}%{_prefix}/share/doc/packages/rocclr/LICENSE.txt ]; then
+    rm %{buildroot}%{_prefix}/share/doc/packages/rocclr*/LICENSE.txt
+fi
+if [ -f %{buildroot}%{_prefix}/share/doc/opencl/LICENSE.txt ]; then
+    rm %{buildroot}%{_prefix}/share/doc/opencl*/LICENSE.txt
+fi
+if [ -f %{buildroot}%{_prefix}/share/doc/hip-asan/LICENSE.txt ]; then
+    rm %{buildroot}%{_prefix}/share/doc/hip-asan/LICENSE.txt
+fi
+if [ -f %{buildroot}%{_prefix}/share/doc/hip/LICENSE.txt ]; then
+    rm %{buildroot}%{_prefix}/share/doc/hip/LICENSE.txt
+fi
+

 %if %{with ocl}
 %files -n rocm-opencl
@@ -397,11 +389,8 @@ rm -f %{buildroot}%{_prefix}/share/doc/hip/LICENSE.txt
 %endif

 %changelog
-* Wed Aug 27 2025 Tom Rix <Tom.Rix@amd.com> - 6.4.2-4
- Add Fedora copyright
-
-* Mon Aug 25 2025 Tom Rix <Tom.Rix@amd.com> - 6.4.2-3
- Simplify file removal
+* Thu Aug 7 2025 Egbert Eich <eich@suse.com> - 6.4.2-3
+- Enable cppheaderparser and fix python dependencies for SUSE.

 * Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.4.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild