Date: Sat, 5 Feb 2022 09:20:32 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fdfd3de1e069 - main - devel/ispc: Backport FreeBSD patches - now all tests pass Message-ID: <202202050920.2159KW3Q073531@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=fdfd3de1e069f9497e9f9f3dda7d5a9158729655 commit fdfd3de1e069f9497e9f9f3dda7d5a9158729655 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2022-02-05 09:17:00 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2022-02-05 09:20:22 +0000 devel/ispc: Backport FreeBSD patches - now all tests pass Disable the XE option - it is currently broken and not recommended. --- devel/ispc/Makefile | 12 ++++++++++-- devel/ispc/distinfo | 12 +++++++++++- devel/ispc/files/patch-CMakeLists.txt | 22 ---------------------- .../ispc/files/patch-cmake_GenerateBuiltins.cmake | 11 ----------- devel/ispc/files/patch-src_module.cpp | 11 ----------- 5 files changed, 21 insertions(+), 47 deletions(-) diff --git a/devel/ispc/Makefile b/devel/ispc/Makefile index 45717a4afdf0..351eee3e4bde 100644 --- a/devel/ispc/Makefile +++ b/devel/ispc/Makefile @@ -3,8 +3,16 @@ PORTNAME= ispc DISTVERSIONPREFIX= v DISTVERSION= 1.17.0 +PORTREVISION= 1 CATEGORIES= devel +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 3fce3f7be9a118c47ed1756ffee9301e9a167ca4.patch:-p1 \ + ef1873aa63b7b81e5e05b5c422919e82668df0a5.patch:-p1 \ + 23df305ed8d786d76b9996461e0a885d274aa031.patch:-p1 \ + 3a349e324ec7e1318efbb1c6bd56917cedf2c3a9.patch:-p1 \ + e1ffe37ecef2e882aac9ee5676b8816ffd6fb1d9.patch:-p1 # https://github.com/ispc/ispc/pull/2258 + MAINTAINER= yuri@FreeBSD.org COMMENT= Intel's compiler for high-performance SIMD programming @@ -33,7 +41,6 @@ PLIST_FILES= bin/ispc \ bin/check_isa OPTIONS_DEFINE_amd64= XE -OPTIONS_DEFAULT_amd64= XE XE_DESC= Enable Intel Xe support XE_BUILD_DEPENDS= ${LOCALBASE}/llvm${LLVM_VERSION}/lib/libLLVMGenXIntrinsics.a:devel/vc-intrinsics@llvm${LLVM_VERSION} @@ -56,6 +63,7 @@ XE_PLIST_FILES= include/ispcrt/ispcrt.h \ lib/libispcrt.so.1 \ lib/libispcrt.so.${PORTVERSION} \ lib/libispcrt_static.a +XE_BROKEN= Unknown architecture #.include <bsd.port.options.mk> #.if ${LLVM_DEFAULT:M[7891]0} || ${LLVM_DEFAULT:M1[12]} # max(LLVM_DEFAULT,13) @@ -66,7 +74,7 @@ XE_PLIST_FILES= include/ispcrt/ispcrt.h \ LLVM_VERSION?= 13 -do-test: # some tests fail: https://github.com/ispc/ispc/issues/1868, https://github.com/ispc/ispc/issues/2244 +do-test: # all tests pass @cd ${WRKSRC} && ISPC_HOME=${BUILD_WRKSRC}/bin ./run_tests.py test-check-all: # the upstream claims that some of these checks are broken without using their patched llvm version, hence using llvm-devel diff --git a/devel/ispc/distinfo b/devel/ispc/distinfo index a36a0aa08200..09b426c1939c 100644 --- a/devel/ispc/distinfo +++ b/devel/ispc/distinfo @@ -1,3 +1,13 @@ -TIMESTAMP = 1643247706 +TIMESTAMP = 1644005886 SHA256 (ispc-ispc-v1.17.0_GH0.tar.gz) = 37fb1055d6c6b232e112d8d50145d726824ed4d8da93a7396315dceba6c76e62 SIZE (ispc-ispc-v1.17.0_GH0.tar.gz) = 19436681 +SHA256 (3fce3f7be9a118c47ed1756ffee9301e9a167ca4.patch) = f244e0afca51f0c8f84204b6746e02f5d787f5ec7dce099db6ac8477913f2748 +SIZE (3fce3f7be9a118c47ed1756ffee9301e9a167ca4.patch) = 665 +SHA256 (ef1873aa63b7b81e5e05b5c422919e82668df0a5.patch) = 0eab2842e35765dde7c554dc97679f937e3eb798049e07394ed6578c78d14d06 +SIZE (ef1873aa63b7b81e5e05b5c422919e82668df0a5.patch) = 2273 +SHA256 (23df305ed8d786d76b9996461e0a885d274aa031.patch) = 197d64e9d6ae05876912fe9e76fde30ba8061307b1eb4d44e3100d176db29bad +SIZE (23df305ed8d786d76b9996461e0a885d274aa031.patch) = 3666 +SHA256 (3a349e324ec7e1318efbb1c6bd56917cedf2c3a9.patch) = 8271c44276d6b2baa8944543e2600027983af4dab532f32b0d72a1fdd0297de2 +SIZE (3a349e324ec7e1318efbb1c6bd56917cedf2c3a9.patch) = 2210 +SHA256 (e1ffe37ecef2e882aac9ee5676b8816ffd6fb1d9.patch) = 9cea85376df2b6eef8b64e7f7525fa8f72801ef2fc01de2868db9f2881841eb3 +SIZE (e1ffe37ecef2e882aac9ee5676b8816ffd6fb1d9.patch) = 985 diff --git a/devel/ispc/files/patch-CMakeLists.txt b/devel/ispc/files/patch-CMakeLists.txt deleted file mode 100644 index 2c540960cbae..000000000000 --- a/devel/ispc/files/patch-CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ ---- CMakeLists.txt.orig 2022-01-15 08:35:15 UTC -+++ CMakeLists.txt -@@ -45,12 +45,17 @@ set(ISPC_BUILD TRUE) - project(${PROJECT_NAME}) - - set(X86_HOST FALSE) --if (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "AMD64|86") -+if (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "amd64|86") - set(X86_HOST TRUE) - endif() - -+set(ARM_HOST FALSE) -+if (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "aarch64") -+ set(ARM_HOST TRUE) -+endif() -+ - option(X86_ENABLED "Enable x86 support" ${X86_HOST}) --option(ARM_ENABLED "Enable ARM support" ON) -+option(ARM_ENABLED "Enable ARM support" ${ARM_HOST}) - option(WASM_ENABLED "Enable experimental Web Assembly support" OFF) - option(XE_ENABLED "Enable Intel Xe support" OFF) - option(ISPC_INCLUDE_EXAMPLES "Generate build targets for the ISPC examples" ON) diff --git a/devel/ispc/files/patch-cmake_GenerateBuiltins.cmake b/devel/ispc/files/patch-cmake_GenerateBuiltins.cmake deleted file mode 100644 index d256ac87934d..000000000000 --- a/devel/ispc/files/patch-cmake_GenerateBuiltins.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/GenerateBuiltins.cmake.orig 2022-01-15 08:35:15 UTC -+++ cmake/GenerateBuiltins.cmake -@@ -312,6 +312,8 @@ function(builtin_xe_to_cpp bit resultFileName) - set(os_name "windows") - elseif (APPLE) - set(SKIP ON) -+ elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ set(os_name "freebsd") - else () - set(os_name "linux") - endif() diff --git a/devel/ispc/files/patch-src_module.cpp b/devel/ispc/files/patch-src_module.cpp deleted file mode 100644 index 4eb8cb73a255..000000000000 --- a/devel/ispc/files/patch-src_module.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/module.cpp.orig 2022-01-15 08:35:15 UTC -+++ src/module.cpp -@@ -105,7 +105,7 @@ - #define OCLOC_LIBRARY_NAME "ocloc64.dll" - #elif defined(_WIN32) - #define OCLOC_LIBRARY_NAME "ocloc32.dll" --#elif defined(__linux__) -+#elif defined(__linux__) || defined(__FreeBSD__) - #define OCLOC_LIBRARY_NAME "libocloc.so" - #else - #error "Unexpected platform"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202050920.2159KW3Q073531>