diff --git a/.gitignore b/.gitignore index 1915b8e..af015cd 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /ispc-1.18.0.tar.gz /ispc-1.18.1.tar.gz /ispc-ec62d6c.tar.gz +/ispc-1.19.0.tar.gz diff --git a/0001-Link-against-libclang-cpp.so.patch b/0001-Link-against-libclang-cpp.so.patch deleted file mode 100644 index a4a2811..0000000 --- a/0001-Link-against-libclang-cpp.so.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff -ru ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/alloy.py ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/alloy.py ---- ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/alloy.py 2023-01-01 23:55:34.000000000 -0800 -+++ ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/alloy.py 2023-01-01 23:55:34.000000000 -0800 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python3 -+#! /usr/bin/python3 -sP - # - # Copyright (c) 2013-2022, Intel Corporation - # All rights reserved. -diff -ru ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/bitcode2cpp.py ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/bitcode2cpp.py ---- ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/bitcode2cpp.py 2023-01-01 23:55:34.000000000 -0800 -+++ ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/bitcode2cpp.py 2023-01-01 23:55:34.000000000 -0800 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python3 -+#! /usr/bin/python3 -sP - - import sys - import re -diff -ru ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/check_env.py ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/check_env.py ---- ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/check_env.py 2023-01-01 23:55:34.000000000 -0800 -+++ ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/check_env.py 2023-01-01 23:55:34.000000000 -0800 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python3 -+#! /usr/bin/python3 -sP - # - # Copyright (c) 2013-2020, Intel Corporation - # All rights reserved. -diff -ru ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/CMakeLists.txt ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/CMakeLists.txt ---- ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/CMakeLists.txt 2023-01-01 23:55:34.000000000 -0800 -+++ ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/CMakeLists.txt 2023-01-07 14:06:56.078835878 -0800 -@@ -36,8 +36,8 @@ - cmake_minimum_required(VERSION 3.13) - - if (UNIX) -- set(CMAKE_C_COMPILER "clang") -- set(CMAKE_CXX_COMPILER "clang++") -+ set(CMAKE_C_COMPILER "gcc") -+ set(CMAKE_CXX_COMPILER "g++") - endif() - - set(PROJECT_NAME ispc) -@@ -289,10 +289,7 @@ - list(APPEND ISPC_TARGETS wasm-i32x4) - endif() - --set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex) --if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "15.0.0") -- list(APPEND CLANG_LIBRARY_LIST clangSupport) --endif() -+set(CLANG_LIBRARY_LIST clang-cpp) - - set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option frontendopenmp) - if (XE_ENABLED AND ${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "14.0.0") -@@ -513,7 +510,7 @@ - - if (NOT MSVC) - set_target_properties(${PROJECT_NAME} PROPERTIES CXX_EXTENSIONS OFF) -- target_compile_options(${PROJECT_NAME} PRIVATE -Wno-c99-extensions -Wno-deprecated-register -fno-rtti) -+ target_compile_options(${PROJECT_NAME} PRIVATE -fno-rtti) - if (ISPC_USE_ASAN) - target_compile_options(${PROJECT_NAME} PRIVATE -fsanitize=address) - endif() -Only in ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original: CMakeLists.txt.rej -diff -ru ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/common.py ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/common.py ---- ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/common.py 2023-01-01 23:55:34.000000000 -0800 -+++ ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/common.py 2023-01-01 23:55:34.000000000 -0800 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python3 -+#! /usr/bin/python3 -sP - # - # Copyright (c) 2013-2022, Intel Corporation - # All rights reserved. -diff -ru ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/perf.py ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/perf.py ---- ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/perf.py 2023-01-01 23:55:34.000000000 -0800 -+++ ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/perf.py 2023-01-01 23:55:34.000000000 -0800 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python3 -+#! /usr/bin/python3 -sP - # - # Copyright (c) 2013-2020, Intel Corporation - # All rights reserved. -diff -ru ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/run_tests.py ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/run_tests.py ---- ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/run_tests.py 2023-01-01 23:55:34.000000000 -0800 -+++ ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/run_tests.py 2023-01-01 23:55:34.000000000 -0800 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python3 -+#! /usr/bin/python3 -sP - # - # Copyright (c) 2013-2022, Intel Corporation - # All rights reserved. -diff -ru ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/stdlib2cpp.py ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/stdlib2cpp.py ---- ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/stdlib2cpp.py 2023-01-01 23:55:34.000000000 -0800 -+++ ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/stdlib2cpp.py 2023-01-01 23:55:34.000000000 -0800 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python3 -+#! /usr/bin/python3 -sP - - import sys - -diff -ru ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/utils/lit/lit/ProgressBar.py ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/utils/lit/lit/ProgressBar.py ---- ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/utils/lit/lit/ProgressBar.py 2023-01-01 23:55:34.000000000 -0800 -+++ ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/utils/lit/lit/ProgressBar.py 2023-01-01 23:55:34.000000000 -0800 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#! /usr/bin/python3 -sP - - # Source: http://code.activestate.com/recipes/475116/, with - # modifications by Daniel Dunbar. -diff -ru ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/utils/lit/lit.py ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/utils/lit/lit.py ---- ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e.original/utils/lit/lit.py 2023-01-01 23:55:34.000000000 -0800 -+++ ispc-ec62d6cbef2fab4c49003c0206716d3d6248b59e/utils/lit/lit.py 2023-01-01 23:55:34.000000000 -0800 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python3 -+#! /usr/bin/python3 -sP - - from lit.main import main - diff --git a/0001-ipsc-include-cstdint.patch b/0001-ipsc-include-cstdint.patch new file mode 100644 index 0000000..8054696 --- /dev/null +++ b/0001-ipsc-include-cstdint.patch @@ -0,0 +1,12 @@ +diff -ru ispc-1.19.0.original/src/target_registry.h ispc-1.19.0/src/target_registry.h +--- ispc-1.19.0.original/src/target_registry.h 2023-02-27 23:53:24.000000000 -0800 ++++ ispc-1.19.0/src/target_registry.h 2023-02-28 16:58:36.179549748 -0800 +@@ -41,6 +41,7 @@ + + #include + #include ++#include + #include + + namespace ispc { + diff --git a/ispc.spec b/ispc.spec index 8105ddc..dedef16 100644 --- a/ispc.spec +++ b/ispc.spec @@ -1,4 +1,4 @@ -%global with_snapshot 1 +%global with_snapshot 0 %global commit ec62d6cbef2fab4c49003c0206716d3d6248b59e %global shortcommit %(c=%{commit}; echo ${c:0:7}) @@ -24,7 +24,9 @@ BuildRequires: clang-devel BuildRequires: doxygen BuildRequires: flex BuildRequires: gcc-c++ +BuildRequires: libomp-devel BuildRequires: llvm-devel +BuildRequires: pkgconfig(libffi) BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(python3) # Hardcoded path from 32-bit glibc-devel needed to build @@ -37,9 +39,11 @@ BuildRequires: pkgconfig(zlib) # Upstream only supports these architectures ExclusiveArch: x86_64 aarch64 -# https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component-Libraries-In-clang-lib-Package -# -Patch0: 0001-Link-against-libclang-cpp.so.patch +# Include missing #include from gcc 13 +# https://github.com/EttusResearch/uhd/pull/652 +%if 0%{?fedora} > 37 +Patch: 0001-ipsc-include-cstdint.patch +%endif %description A compiler for a variant of the C programming language, with extensions for @@ -80,7 +84,6 @@ sed -i 's| -Werror ||g' CMakeLists.txt -DCMAKE_EXE_LINKER_FLAGS="%{optflags} -fPIE" \ -DISPC_INCLUDE_EXAMPLES=OFF \ -DISPC_INCLUDE_TESTS=OFF \ - -DISPC_NO_DUMPS=ON \ -DLEVEL_ZERO_INCLUDE_DIR=%{_includedir} \ -DLEVEL_ZERO_LIB_LOADER=%{_libddir} \ -DLLVM_ENABLE_ASSERTIONS=OFF @@ -106,3 +109,4 @@ rm %{buildroot}%{_libdir}/lib%{name}rt_static.a %changelog %autochangelog + diff --git a/sources b/sources index 887da5b..8b9410f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ispc-ec62d6c.tar.gz) = d0d1bf0d246902cd7ea4053f0947333dd8963af80d0eb0344bc9020dc3eb6d3f5ffae6b11af8b64d8d590f6ad62a5f5f386abc8617af60138cb07c37138012e3 +SHA512 (ispc-1.19.0.tar.gz) = 140f16bc0f9e0a94853b50a5433be9196ee09b6c70a1840d400d0d201143da8cb2b1b92a857acf5856ed3410bfffd17678eb1029996f9007fe947f5ac78bf1bb