From nobody Sat Feb 5 09:20:32 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 35945198F293; Sat, 5 Feb 2022 09:20:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JrRhf1l12z3rMf; Sat, 5 Feb 2022 09:20:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644052834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=06wCjjUtx8pzv3ggYzDXcwwYXNtzAFM/t3ezgC7ueso=; b=v1cOBiRNjmjMoNYNQ/PVEsxon5UYC+sIU2lkLCuCI2Xt/onbi12AB4FfHbOMYioA11+mgF CT+g7jMmH6nlJ4F/KIIb7emFu68VS29lXcpoz0w7SLeVJyhzWgPHv28hlvkxaV67jxOl6X 2+0zWYxX+BsReK1flSRgqbja6Za2fx1KiFZ+niYlnat2DdvWHv0yeCnJJAzNF8sA9p/iGQ pcuUJKhbQBtYnzygScVK/bcfDX5pq3McyejmgWhaKTyl/kh9WkMjPou4abwwVuCkjYidB8 1CNbTITHsRml0Meh5qQMwqD9hQ7fznirr8OGJBzoPrSSW9Vt1wbcSp4/mI/Waw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EDAFA1CC69; Sat, 5 Feb 2022 09:20:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2159KW90073532; Sat, 5 Feb 2022 09:20:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2159KW3Q073531; Sat, 5 Feb 2022 09:20:32 GMT (envelope-from git) Date: Sat, 5 Feb 2022 09:20:32 GMT Message-Id: <202202050920.2159KW3Q073531@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: fdfd3de1e069 - main - devel/ispc: Backport FreeBSD patches - now all tests pass List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fdfd3de1e069f9497e9f9f3dda7d5a9158729655 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644052834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=06wCjjUtx8pzv3ggYzDXcwwYXNtzAFM/t3ezgC7ueso=; b=OuuClFiX5tFhhxCYA2LUrR+D+GaBV9LCMC0BpIn2yOb37XAlif0VbFaRbRKukcHYyaTtv8 VXF7kJMLoKVOUymnrI5+Syl8n25PkMnN00cxGoR7XHU6Ta34sO7Bt/ZM1lgbg8iGY9B6em u+CeLrbZFWE/5tGtN+JCdxvhHoO+b4IOxIQurYx+xNqIUjpRDKWwiuvNjgq+Wfpw/sJHhH SGbSzJrFky51GA0MWZGQ3iTftVVEaFEVudHw30I9fAhaUpeoeNnLbjuiC4djeCNyE+6NFa I/05SYqAmZAA2/IqcXzgoUW5Iqg30YlzHkRCCyIt5hWEZB/UTB5i+WmshqKcJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644052834; a=rsa-sha256; cv=none; b=VQg4t/wutQhiMNKMImVZXOu5Zx48DXZ+9dbpAveScqeukzHRhoD9Bbh0BRc/sKe1S7nbcq fBfxwyQxYGM9Nrrq7rAqThAOK0MMQk1TEdS7YqLbOI0I7MMklkUdN3twfK1ekUwbhzAJWX h4+eZPWg6xAzYl99TvavCzT2P1lT8ugQgMs+VkP906nDaWUTrecQ58zO3/wbLW5WvepYOy 77dF6rpu30qr7BjnXcsXFZ3Gyt3x5qrdPAYdnjeoQwkPRKKwj1eGOauAPrJt1HRaYFP/Z8 sgMbnW4I1y1DM2u7i0I45MnBXsI8YDDle2X62GRbQIENF/UlR8IEqJy82nXh7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=fdfd3de1e069f9497e9f9f3dda7d5a9158729655 commit fdfd3de1e069f9497e9f9f3dda7d5a9158729655 Author: Yuri Victorovich AuthorDate: 2022-02-05 09:17:00 +0000 Commit: Yuri Victorovich 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 #.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"