openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package ispc

--- ispc.changes.orig
+++ ispc.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Fri May  3 09:59:24 UTC 2024 - Hans-Peter Jansen <hpj@urpla.net>
+
+- Switch build to llvm17 similar to official releases, where available
+- explicitly link with dl (needed for llvm 15: 15.4, 15.5)
+- Disable static builds
+
+-------------------------------------------------------------------
 Mon Apr 29 23:17:45 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
 
 - Update to 1.23.0 
@@ -25,6 +32,12 @@ Mon Nov  6 16:17:11 UTC 2023 - Dominique
   supported.
 
 -------------------------------------------------------------------
+Sat Apr  1 10:12:30 UTC 2023 - Hans-Peter Jansen <hpj@urpla.net>
+
+- Add another BuildIgnore for clang-tools, that would render the
+  llvm14 containment ineffective (by depending on clang16).
+
+-------------------------------------------------------------------
 Fri Mar 24 10:08:22 UTC 2023 - Hans-Peter Jansen <hpj@urpla.net>
 
 - Add ispc-add-cstdint-include.patch to fix compilation with GCC 13.
--- ispc.spec.orig
+++ ispc.spec
@@ -1,8 +1,8 @@
 #
 # spec file for package ispc
 #
-# Copyright (c) 2023 SUSE LLC
-# Copyright (c) 2020-2023 LISA GmbH, Bingen, Germany.
+# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2020-2024 LISA GmbH, Bingen, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,12 @@
 #
 
 
-%define llvm_ver 14
+# use LLVM 17 similar to official builds, if available
+%if 0%{?sle_version} <= 150500
+%define llvm_ver 15
+%else
+%define llvm_ver 17
+%endif
 %define libname libispcrt1
 
 # LLVM is build with OpenMP support only on 64bit archs and x86
@@ -35,7 +40,6 @@ License:        BSD-3-Clause
 Group:          Development/Languages/C and C++
 URL:            https://ispc.github.io/
 Source:         https://github.com/%{name}/%{name}/archive/v%{version}/v-%{version}.tar.gz#/%{name}-%{version}.tar.gz
-#!BuildIgnore:  clang15
 BuildRequires:  bison
 BuildRequires:  clang%llvm_ver-devel
 BuildRequires:  cmake >= 3.13
@@ -87,25 +91,26 @@ programs using %{name}, you will need to
 %autosetup -p1
 
 # fix clang library modules for our clang 10 and above
-sed -i 's|set(CLANG_LIBRARY_LIST .*)|set(CLANG_LIBRARY_LIST clang-cpp)|' CMakeLists.txt
+#sed -i 's|set(CLANG_LIBRARY_LIST .*)|set(CLANG_LIBRARY_LIST clang-cpp)|' CMakeLists.txt
 
 # disable build of static library, https://github.com/ispc/ispc/issues/2385
-sed -i -e '/build_ispcrt(STATIC/ s@.*@#\0@' ispcrt/CMakeLists.txt
+#sed -i -e '/build_ispcrt(STATIC/ s@.*@#\0@' ispcrt/CMakeLists.txt
 
 %build
 %define _lto_cflags "-flto=thin"
 echo "optflags: %{optflags}"
+# explicitly linking with dl is needed for llvm 15 by now
 # our llvm is built without assertions, which is required for DUMPS to be operational
 %cmake \
         -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         -DCMAKE_C_FLAGS:STRING="$CFLAGS %{optflags} -fPIE" \
         -DCMAKE_CXX_FLAGS:STRING="$CXXFLAGS %{optflags} -fPIE" \
-        -DCMAKE_EXE_LINKER_FLAGS="%{optflags} -pie" \
+        -DCMAKE_SHARED_LINKER_FLAGS="%{optflags} -Wl,--as-needed -ldl" \
         -DCURSES_CURSES_LIBRARY=/usr/%_lib/libncurses.so \
         -DISPCRT_BUILD_TASK_MODEL=%{?with_openmp_task_model:OpenMP}%{!?with_openmp_task_model:TBB} \
+        -DISPCRT_BUILD_STATIC=OFF \
         -DISPC_INCLUDE_EXAMPLES=OFF \
         -DISPC_INCLUDE_TESTS=ON \
-        -DISPCRT_BUILD_STATIC=OFF \
         -DISPC_NO_DUMPS=ON
 
 %cmake_build

Places

File project.diff of Package ispc

Places