Attachment 2067008 Details for Bug 2335652 – The .spec file difference from Copr build 8472432 to 8558142

[patch] The .spec file difference from Copr build 8472432 to 8558142

spec-from-8472432-to-8558142.diff (text/plain), 4.21 KB, created by Fedora Review Service on 2025-01-22 03:25:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fedora Review Service

Created: 2025-01-22 03:25:16 UTC

Size: 4.21 KB

patch

obsolete

>--- https://copr.fedorainfracloud.org/coprs/build/8472432
>+++ https://copr.fedorainfracloud.org/coprs/build/8558142
>@@ -9,7 +9,6 @@
> 
> %global toolchain clang
> 
>-%global _lto_cflags %{nil}
> %global bundle_prefix %{_libdir}/rocm/llvm
> %global llvm_triple %{_target_platform}
> 
>@@ -17,7 +16,7 @@
> %if %{with debug}
> %global build_type DEBUG
> %else
>-%global build_type RELEASE
>+%global build_type RelWithDebInfo
> %endif
> 
> Name:           rocm-omp
>@@ -34,6 +33,7 @@
> BuildRequires:  binutils-devel
> BuildRequires:  cmake
> BuildRequires:  gcc-c++
>+BuildRequires:  fdupes
> BuildRequires:  libffi-devel
> BuildRequires:  libzstd-devel
> BuildRequires:  perl
>@@ -42,9 +42,7 @@
> BuildRequires:  rocm-runtime-devel
> BuildRequires:  zlib-devel
> 
>-%if 0%{?fedora} || 0%{?suse_version}
>-BuildRequires:  fdupes
>-%endif
>+Requires:       rocm-llvm-filesystem
> 
> ExclusiveArch:  x86_64
> %global targets_to_build "X86;AMDGPU"
>@@ -72,25 +70,38 @@
> # no nvidia
> sed -i -e 's@LIBOMPTARGET_DEVICE_ARCHITECTURES "all"@LIBOMPTARGET_DEVICE_ARCHITECTURES "${all_amdgpu_architectures}"@' openmp/libomptarget/DeviceRTL/CMakeLists.txt
> 
>+# rm llvm-project bits we do not need
>+rm -rf {bolt,clang,compiler-rt,flang,libc,libclc,libcxx,libcxxabi,libunwind,lld,lldb,llvm-libgcc,mlir,polly,pst,runtimes,utils}
>+
> %build
> 
> %global llvmrocm_cmake_config \\\
>  -DBUILD_SHARED_LIBS=OFF \\\
>- -DLLVM_BUILD_LLVM_DYLIB=ON \\\
>- -DLLVM_LINK_LLVM_DYLIB=ON \\\
>  -DBUILD_TESTING=OFF \\\
>+ -DCLANG_ENABLE_STATIC_ANALYZER=OFF \\\
>  -DCLANG_ENABLE_ARCMT=OFF \\\
>- -DCLANG_ENABLE_STATIC_ANALYZER=OFF \\\
>+ -DCLANG_TOOL_CLANG_FUZZER_BUILD=OFF \\\
>  -DCMAKE_BUILD_TYPE=%{build_type} \\\
>+ -DCMAKE_INSTALL_DO_STRIP=ON \\\
>  -DCMAKE_INSTALL_PREFIX=%{bundle_prefix} \\\
>+ -DCOMPILER_RT_BUILD_BUILTINS=ON \\\
>+ -DCOMPILER_RT_BUILD_GWP_ASAN=OFF \\\
>+ -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \\\
>+ -DCOMPILER_RT_BUILD_MEMPROF=OFF \\\
>+ -DCOMPILER_RT_BUILD_ORC=OFF \\\
>+ -DCOMPILER_RT_BUILD_PROFILE=OFF \\\
>  -DCOMPILER_RT_BUILD_SANITIZERS=OFF \\\
>+ -DCOMPILER_RT_BUILD_XRAY=OFF \\\
>+ -DENABLE_LINKER_BUILD_ID=ON \\\
>+ -DLIBCXX_INCLUDE_BENCHMARKS=OFF \\\
>+ -DLIBCXXABI_USE_LLVM_UNWINDER=OFF \\\
>  -DLLVM_BINUTILS_INCDIR=%{_includedir} \\\
>  -DLLVM_BUILD_RUNTIME=ON \\\
>- -DLLVM_BUILD_TOOLS=ON \\\
>- -DLLVM_BUILD_UTILS=ON \\\
>  -DLLVM_DEFAULT_TARGET_TRIPLE=%{llvm_triple} \\\
>  -DLLVM_ENABLE_EH=ON \\\
>  -DLLVM_ENABLE_FFI=ON \\\
>+ -DLLVM_ENABLE_LIBCXX=ON \\\
>+ -DLLVM_ENABLE_OCAMLDOC=OFF \\\
>  -DLLVM_ENABLE_RTTI=ON \\\
>  -DLLVM_ENABLE_ZLIB=ON \\\
>  -DLLVM_ENABLE_ZSTD=ON \\\
>@@ -98,17 +109,28 @@
>  -DLLVM_INCLUDE_EXAMPLES=OFF \\\
>  -DLLVM_INCLUDE_TESTS=OFF \\\
>  -DLLVM_TARGETS_TO_BUILD=%{targets_to_build} \\\
>+ -DLLVM_TOOL_LLVM_AS_FUZZER_BUILD=OFF \\\
>+ -DLLVM_TOOL_LLVM_DIS_FUZZER_BUILD=OFF \\\
>+ -DLLVM_TOOL_LLVM_DLANG_DEMANGLE_FUZZER_BUILD=OFF \\\
>+ -DLLVM_TOOL_LLVM_ISEL_FUZZER_BUILD=OFF \\\
>+ -DLLVM_TOOL_LLVM_ITANIUM_DEMANGLE_FUZZER_BUILD=OFF \\\
>+ -DLLVM_TOOL_LLVM_MC_ASSEMBLE_FUZZER_BUILD=OFF \\\
>+ -DLLVM_TOOL_LLVM_MC_DISASSEMBLE_FUZZER_BUILD=OFF \\\
>+ -DLLVM_TOOL_LLVM_MICROSOFT_DEMANGLE_FUZZER_BUILD=OFF \\\
>+ -DLLVM_TOOL_LLVM_OPT_FUZZER_BUILD=OFF \\\
>+ -DLLVM_TOOL_LLVM_RUST_DEMANGLE_FUZZER_BUILD=OFF \\\
>+ -DLLVM_TOOL_LLVM_SPECIAL_CASE_LIST_FUZZER_BUILD=OFF \\\
>+ -DLLVM_TOOL_LLVM_YAML_NUMERIC_PARSER_FUZZER_BUILD=OFF \\\
>+ -DLLVM_TOOL_LLVM_YAML_PARSER_FUZZER_BUILD=OFF \\\
>+ -DLLVM_TOOL_VFABI_DEMANGLE_FUZZER_BUILD=OFF \\\
>  -DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF \\\
>- -DMLIR_BUILD_MLIR_C_DYLIB=ON \\\
>- -DROCM_DIR=%{_prefix}
>-
>-pushd .
>-%if 0%{?is_opensuse}
>-%define __sourcedir openmp
>-%else
>-%define _vpath_srcdir openmp
>-%endif
>-
>+ -DLLVM_BUILD_LLVM_DYLIB=ON \\\
>+ -DLLVM_LINK_LLVM_DYLIB=ON \\\
>+ -DLLVM_BUILD_TOOLS=ON \\\
>+ -DLLVM_BUILD_UTILS=ON \\\
>+ -DMLIR_BUILD_MLIR_C_DYLIB=ON
>+
>+cd openmp
> %cmake %{llvmrocm_cmake_config} \
>        -DBUILD_SHARED=ON \
>        -DClang_DIR=%{rocmllvm_cmakedir}/../clang \
>@@ -140,16 +162,17 @@
>        -DOPENMP_STANDALONE_BUILD=ON \
>        -DOPENMP_LLVM_TOOLS_DIR=%{rocmllvm_bindir}
> 
>+export LD_LIBRARY_PATH=%{rocmllvm_libdir}
>+
> %cmake_build
> 
> %install
> 
>+cd openmp
> %cmake_install
> 
>-#Clean up dupes:
>-%if 0%{?fedora} || 0%{?suse_version}
>+# Clean up dupes:
> %fdupes %{buildroot}%{_prefix}
>-%endif
> 
> if [ -d %{buildroot}%{bundle_prefix}/lib/omptest ]; then
>     rm -rf %{buildroot}%{bundle_prefix}/lib/omptest

Actions: View | Diff

Attachments on bug 2335652: 2067008 | 2074043