Skip to content

Commit 86e1879

Browse files
committed
ispc: update to 1.28.1
1 parent 04c9ed3 commit 86e1879

File tree

2 files changed

+36
-44
lines changed

2 files changed

+36
-44
lines changed

mingw-w64-ispc/001-mingw-build.patch

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
diff -Naur ispc-1.27.0-orig/CMakeLists.txt ispc-1.27.0/CMakeLists.txt
2-
--- ispc-1.27.0-orig/CMakeLists.txt 2025-05-16 01:24:52.000000000 +0300
3-
+++ ispc-1.27.0/CMakeLists.txt 2025-06-10 15:33:13.821883100 +0300
4-
@@ -387,7 +387,7 @@
5-
message(FATAL_ERROR "ISPC requires LLVM 17.0.0 or later")
1+
--- a/CMakeLists.txt
2+
+++ b/CMakeLists.txt
3+
@@ -408,7 +408,7 @@
4+
message(FATAL_ERROR "ISPC requires LLVM 18.0.0 or later")
65
endif()
76

87
-set(CLANG_LIBRARY_LIST clangFrontend clangBasic clangEdit clangLex clangSupport clangASTMatchers)
98
+set(CLANG_LIBRARY_LIST clangFrontend clangEdit clangLex clangBasic clangSupport clangASTMatchers)
109

1110
set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option frontendopenmp passes)
12-
13-
@@ -723,6 +723,9 @@
11+
if (ISPC_LIBRARY_JIT)
12+
@@ -765,6 +765,9 @@
1413
list(APPEND LINK_OPTIONS_PUBLIC)
1514
# Link options
1615
if (WIN32)
@@ -20,35 +19,32 @@ diff -Naur ispc-1.27.0-orig/CMakeLists.txt ispc-1.27.0/CMakeLists.txt
2019
list(APPEND LINK_OPTIONS_PRIVATE /DYNAMICBASE)
2120
# Control flow guard
2221
list(APPEND LINK_OPTIONS_PRIVATE /GUARD:CF)
23-
@@ -732,6 +735,7 @@
22+
@@ -774,6 +777,7 @@
2423
if (MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "DEBUG" )
2524
list(APPEND LINK_OPTIONS_PUBLIC /OPT:REF /OPT:ICF)
2625
endif()
2726
+ endif()
2827
elseif (APPLE)
2928
if(CMAKE_BUILD_TYPE MATCHES Release)
3029
list(APPEND LINK_OPTIONS_PUBLIC "SHELL: -Wl,-dead_strip")
31-
@@ -802,14 +806,14 @@
30+
@@ -844,12 +847,12 @@
3231

3332
# System libraries, our own and transitive dependencies from LLVM libs.
3433
if (WIN32)
3534
- list(APPEND LINK_LIBRARIES version.lib shlwapi.lib odbc32.lib odbccp32.lib)
3635
+ list(APPEND LINK_LIBRARIES version shlwapi odbc32 odbccp32)
3736
# Required after LLVM commit a5ffabc
38-
if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "18.1.0")
39-
- list(APPEND LINK_LIBRARIES ws2_32.lib)
40-
+ list(APPEND LINK_LIBRARIES ws2_32)
41-
endif()
37+
- list(APPEND LINK_LIBRARIES ws2_32.lib)
38+
+ list(APPEND LINK_LIBRARIES ws2_32)
4239
# Required after LLVM commit cb7690a
4340
if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "19.1.0")
4441
- list(APPEND LINK_LIBRARIES ntdll.lib)
4542
+ list(APPEND LINK_LIBRARIES ntdll)
4643
endif()
4744
else()
4845
run_llvm_config(LLVM_SYSTEM_LIBS "--system-libs")
49-
diff -Naur ispc-1.27.0-orig/builtins/builtins-c-cpu.cpp ispc-1.27.0/builtins/builtins-c-cpu.cpp
50-
--- ispc-1.27.0-orig/builtins/builtins-c-cpu.cpp 2025-05-16 01:24:52.000000000 +0300
51-
+++ ispc-1.27.0/builtins/builtins-c-cpu.cpp 2025-06-10 15:33:13.821883100 +0300
46+
--- a/builtins/builtins-c-cpu.cpp
47+
+++ a/builtins/builtins-c-cpu.cpp
5248
@@ -24,7 +24,7 @@
5349
*/
5450
#ifndef WASM
@@ -58,9 +54,8 @@ diff -Naur ispc-1.27.0-orig/builtins/builtins-c-cpu.cpp ispc-1.27.0/builtins/bui
5854
// We do want old school sprintf and don't want secure Microsoft extensions.
5955
// And we also don't want warnings about it, so the define.
6056
#define _CRT_SECURE_NO_WARNINGS
61-
diff -Naur ispc-1.27.0-orig/ispcrt/CMakeLists.txt ispc-1.27.0/ispcrt/CMakeLists.txt
62-
--- ispc-1.27.0-orig/ispcrt/CMakeLists.txt 2025-05-16 01:24:52.000000000 +0300
63-
+++ ispc-1.27.0/ispcrt/CMakeLists.txt 2025-06-10 15:33:13.829848200 +0300
57+
--- a/ispcrt/CMakeLists.txt
58+
+++ b/ispcrt/CMakeLists.txt
6459
@@ -111,7 +111,7 @@
6560
-fstack-protector-strong -fno-delete-null-pointer-checks -fwrapv)
6661
target_compile_options(ispcrt_interface_lib INTERFACE -Wall -Wextra -Wno-unused-private-field)
@@ -70,9 +65,8 @@ diff -Naur ispc-1.27.0-orig/ispcrt/CMakeLists.txt ispc-1.27.0/ispcrt/CMakeLists.
7065
target_link_options(ispcrt_interface_lib INTERFACE
7166
"SHELL: -z noexecstack"
7267
"SHELL: -z relro"
73-
diff -Naur ispc-1.27.0-orig/ispcrt/detail/cpu/CPUDevice.cpp ispc-1.27.0/ispcrt/detail/cpu/CPUDevice.cpp
74-
--- ispc-1.27.0-orig/ispcrt/detail/cpu/CPUDevice.cpp 2025-05-16 01:24:52.000000000 +0300
75-
+++ ispc-1.27.0/ispcrt/detail/cpu/CPUDevice.cpp 2025-06-10 15:33:13.839623300 +0300
68+
--- a/ispcrt/detail/cpu/CPUDevice.cpp
69+
+++ b/ispcrt/detail/cpu/CPUDevice.cpp
7670
@@ -175,7 +175,7 @@
7771
void *fptr = nullptr;
7872
for (auto lib : m_libs) {
@@ -82,9 +76,8 @@ diff -Naur ispc-1.27.0-orig/ispcrt/detail/cpu/CPUDevice.cpp ispc-1.27.0/ispcrt/d
8276
#else
8377
fptr = dlsym(lib ? lib : RTLD_DEFAULT, name);
8478
#endif
85-
diff -Naur ispc-1.27.0-orig/ispcrt/detail/cpu/ispc_tasking.cpp ispc-1.27.0/ispcrt/detail/cpu/ispc_tasking.cpp
86-
--- ispc-1.27.0-orig/ispcrt/detail/cpu/ispc_tasking.cpp 2025-05-16 01:24:52.000000000 +0300
87-
+++ ispc-1.27.0/ispcrt/detail/cpu/ispc_tasking.cpp 2025-06-10 15:33:13.847644600 +0300
79+
--- a/ispcrt/detail/cpu/ispc_tasking.cpp
80+
+++ b/ispcrt/detail/cpu/ispc_tasking.cpp
8881
@@ -55,9 +55,9 @@
8982
defined ISPC_USE_TBB_PARALLEL_FOR || defined ISPC_USE_OMP || defined ISPC_USE_HPX)
9083

@@ -126,10 +119,9 @@ diff -Naur ispc-1.27.0-orig/ispcrt/detail/cpu/ispc_tasking.cpp ispc-1.27.0/ispcr
126119
// Signature of ispc-generated 'task' functions
127120
typedef void (*TaskFuncType)(void *data, int threadIndex, int threadCount, int taskIndex, int taskCount, int taskIndex0,
128121
int taskIndex1, int taskIndex2, int taskCount0, int taskCount1, int taskCount2);
129-
diff -Naur ispc-1.27.0-orig/src/main.cpp ispc-1.27.0/src/main.cpp
130-
--- ispc-1.27.0-orig/src/main.cpp 2025-05-16 01:24:52.000000000 +0300
131-
+++ ispc-1.27.0/src/main.cpp 2025-06-10 15:45:17.325604100 +0300
132-
@@ -42,7 +42,9 @@
122+
--- a/src/args.cpp
123+
+++ b/src/args.cpp
124+
@@ -30,7 +30,9 @@
133125
#ifndef BUILD_DATE
134126
#define BUILD_DATE __DATE__
135127
#endif

mingw-w64-ispc/PKGBUILD

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,30 @@
33
_realname=ispc
44
pkgbase=mingw-w64-${_realname}
55
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
6-
pkgver=1.27.0
6+
pkgver=1.28.1
77
pkgrel=1
88
pkgdesc="Compiler for high-performance SIMD programming on the CPU (mingw-w64)"
99
arch=('any')
1010
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
1111
url="https://ispc.github.io/"
12-
license=('BSD')
12+
msys2_repository_url="https://github.com/ispc/ispc"
13+
license=('spdx:BSD-3-Clause')
1314
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
14-
"${MINGW_PACKAGE_PREFIX}-clang"
15-
"${MINGW_PACKAGE_PREFIX}-llvm"
16-
"${MINGW_PACKAGE_PREFIX}-tbb"
15+
"${MINGW_PACKAGE_PREFIX}-llvm-libs"
16+
"${MINGW_PACKAGE_PREFIX}-clang")
1717
#"${MINGW_PACKAGE_PREFIX}-spirv-llvm-translator"
18-
)
1918
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
2019
"${MINGW_PACKAGE_PREFIX}-cmake"
2120
"${MINGW_PACKAGE_PREFIX}-ninja"
22-
"${MINGW_PACKAGE_PREFIX}-python"
23-
"${MINGW_PACKAGE_PREFIX}-openmp"
21+
"${MINGW_PACKAGE_PREFIX}-llvm"
22+
"${MINGW_PACKAGE_PREFIX}-python")
2423
#"${MINGW_PACKAGE_PREFIX}-level-zero-headers"
2524
#"${MINGW_PACKAGE_PREFIX}-level-zero-loader"
26-
"git"
27-
"bison"
28-
"flex")
29-
source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/ispc/ispc/archive/v${pkgver}.tar.gz"
25+
source=("https://github.com/ispc/ispc/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
3026
001-mingw-build.patch
3127
003-mingw-build-examples.patch)
32-
sha256sums=('c41ae29e4f6b1d37154610e68e9b7a0eb225cd7c080242ab56fa0119e49dbd7a'
33-
'e9db96a883f94592a86d1c2e5a1ed1588de57a5107240dbed76e4bce6c2b867a'
28+
sha256sums=('7d715ec3cc960bcc1bfe4cac0f7561de54c8c124283d15780f610de20f7fec4c'
29+
'4e5425f2066a95303467dd12dbe8515f2caa4d3d44f58e72bf54af0020524511'
3430
'7c718f30d96e307d050cb88e8ae75fc13e1e2bf4caadfcfc45f8f15a39a86129')
3531

3632
prepare() {
@@ -47,7 +43,6 @@ build() {
4743
extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
4844
fi
4945

50-
[[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
5146
mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
5247

5348
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
@@ -57,6 +52,7 @@ build() {
5752
-DBUILD_SHARED_LIBS=ON \
5853
-DISPC_STATIC_LINK=OFF \
5954
-DISPC_INCLUDE_EXAMPLES=OFF \
55+
-DPython3_EXECUTABLE=${MINGW_PREFIX}/bin/python \
6056
${extra_config[@]} \
6157
../${_realname}-${pkgver}
6258

@@ -65,5 +61,9 @@ build() {
6561

6662
package() {
6763
cd "${srcdir}/build-${MSYSTEM}"
64+
6865
DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install .
66+
67+
install -Dm644 "${srcdir}"/${_realname}-${pkgver}/LICENSE.txt \
68+
"${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
6969
}

0 commit comments

Comments
 (0)