git: 867465d85f65 - main - devel/ispc: Update 1.19.0 → 1.20.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Sun, 07 May 2023 18:16:07 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=867465d85f65ca3b44f3d0eacf57d6a3aefd39e8

commit 867465d85f65ca3b44f3d0eacf57d6a3aefd39e8
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-05-07 15:20:12 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-05-07 18:15:53 +0000

    devel/ispc: Update 1.19.0 → 1.20.0
    
    Reported by:    portscout
---
 devel/ispc/Makefile                         |  9 ++++++---
 devel/ispc/distinfo                         |  6 +++---
 devel/ispc/files/patch-cmake_FindLLVM.cmake | 24 ------------------------
 devel/ispc/pkg-plist                        | 21 +++++++++++----------
 4 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/devel/ispc/Makefile b/devel/ispc/Makefile
index 2a29d1ceab54..bb510204b3bf 100644
--- a/devel/ispc/Makefile
+++ b/devel/ispc/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ispc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.19.0
+DISTVERSION=	1.20.0
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -15,7 +15,8 @@ ONLY_FOR_ARCHS_REASON=	only available for these architectures
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
 		m4:devel/m4
-LIB_DEPENDS=	libLLVM.so:devel/llvm${LLVM_VERSION}
+LIB_DEPENDS=	libLLVM.so:devel/llvm${LLVM_VERSION} \
+		libtbb.so:devel/onetbb
 
 USES=		bison cmake compiler:c++17-lang llvm:lib,min=15,max=15 python:build,test shebangfix
 USE_LDCONFIG=	yes
@@ -27,10 +28,12 @@ SHEBANG_FILES=	*.py
 
 CONFIGURE_ENV=	PATH=${LOCALBASE}/llvm${LLVM_VERSION}/bin:${PATH} # see https://github.com/ispc/ispc/issues/2318
 CMAKE_OFF=	ISPC_NO_DUMPS DISPCRT_BUILD_GPU ISPC_INCLUDE_TESTS ISPCRT_BUILD_TESTS ISPC_INCLUDE_EXAMPLES
-CMAKE_ARGS=	-DFREEBSD_LLVM_VERSION=${LLVM_VERSION} # see https://github.com/ispc/ispc/issues/2318
+CMAKE_ARGS=	-DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/llvm${LLVM_VERSION}/bin/llvm-config
 
 BINARY_ALIAS=	flex=${LOCALBASE}/bin/flex python=${PYTHON_CMD} m4=${LOCALBASE}/bin/gm4
 
+PLIST_SUB=	VERSION=${PORTVERSION}
+
 OPTIONS_DEFINE_amd64=	ARM XE
 OPTIONS_DEFINE_i386=	ARM
 
diff --git a/devel/ispc/distinfo b/devel/ispc/distinfo
index 1e5a1d18591a..5fca16951235 100644
--- a/devel/ispc/distinfo
+++ b/devel/ispc/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1677733094
-SHA256 (ispc-ispc-v1.19.0_GH0.tar.gz) = da1eccb8ead495b22d642340f3bab11fb64dd2223cd9cc92f0492f70b30f34b5
-SIZE (ispc-ispc-v1.19.0_GH0.tar.gz) = 19577782
+TIMESTAMP = 1683442031
+SHA256 (ispc-ispc-v1.20.0_GH0.tar.gz) = 28a1de948fb8b6bbe81d981a4821306167c64c305e839708423abb6322cf3b22
+SIZE (ispc-ispc-v1.20.0_GH0.tar.gz) = 19562189
 SHA256 (google-googletest-6a7ed31_GH0.tar.gz) = f488bc430d2b5fdbc51711b142fd50dbf0f33012fa65c5f8e7d4f908ed935bcf
 SIZE (google-googletest-6a7ed31_GH0.tar.gz) = 904250
diff --git a/devel/ispc/files/patch-cmake_FindLLVM.cmake b/devel/ispc/files/patch-cmake_FindLLVM.cmake
deleted file mode 100644
index fea3c3ff9cc5..000000000000
--- a/devel/ispc/files/patch-cmake_FindLLVM.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-- workaround for https://github.com/ispc/ispc/issues/2318
-
---- cmake/FindLLVM.cmake.orig	2022-05-05 23:06:57 UTC
-+++ cmake/FindLLVM.cmake
-@@ -33,7 +33,7 @@
- #
- # ispc FindLLVM.cmake
- #
--find_package(LLVM REQUIRED CONFIG)
-+find_package(LLVM ${FREEBSD_LLVM_VERSION} REQUIRED CONFIG)
-     if (NOT LLVM_FOUND )
-         message(FATAL_ERROR "LLVM package can't be found. \
-                 Set CMAKE_PREFIX_PATH variable to LLVM's installation prefix.")
-@@ -41,8 +41,8 @@ find_package(LLVM REQUIRED CONFIG)
-     set(LLVM_VERSION "LLVM_${LLVM_VERSION_MAJOR}_${LLVM_VERSION_MINOR}")
-     message(STATUS "Found LLVM ${LLVM_VERSION}")
- 
--find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config
--    PATHS ${LLVM_TOOLS_BINARY_DIR} PATH_SUFFIXES bin NO_DEFAULT_PATH)
-+find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config${FREEBSD_LLVM_VERSION}
-+    PATHS ${LLVM_TOOLS_BINARY_DIR} PATH_SUFFIXES bin)
-     if (NOT LLVM_CONFIG_EXECUTABLE)
-         message(FATAL_ERROR "Failed to find llvm-config")
-     endif()
diff --git a/devel/ispc/pkg-plist b/devel/ispc/pkg-plist
index 2ac46c01cd31..194b935cb85c 100644
--- a/devel/ispc/pkg-plist
+++ b/devel/ispc/pkg-plist
@@ -3,15 +3,16 @@ bin/ispc
 include/ispcrt/ispcrt.h
 include/ispcrt/ispcrt.hpp
 include/ispcrt/ispcrt.isph
-lib/cmake/ispcrt-1.19.0/Finddpcpp_compiler.cmake
-lib/cmake/ispcrt-1.19.0/Findlevel_zero.cmake
-lib/cmake/ispcrt-1.19.0/interop.cmake
-lib/cmake/ispcrt-1.19.0/ispc.cmake
-lib/cmake/ispcrt-1.19.0/ispcrtConfig.cmake
-lib/cmake/ispcrt-1.19.0/ispcrtConfigVersion.cmake
-lib/cmake/ispcrt-1.19.0/ispcrt_Exports-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/ispcrt-1.19.0/ispcrt_Exports.cmake
+lib/cmake/ispcrt-%%VERSION%%/Finddpcpp_compiler.cmake
+lib/cmake/ispcrt-%%VERSION%%/Findlevel_zero.cmake
+lib/cmake/ispcrt-%%VERSION%%/interop.cmake
+lib/cmake/ispcrt-%%VERSION%%/ispc.cmake
+lib/cmake/ispcrt-%%VERSION%%/ispcrtConfig.cmake
+lib/cmake/ispcrt-%%VERSION%%/ispcrtConfigVersion.cmake
+lib/cmake/ispcrt-%%VERSION%%/ispcrt_Exports-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/ispcrt-%%VERSION%%/ispcrt_Exports.cmake
 lib/libispcrt.so
-lib/libispcrt.so.1
-lib/libispcrt.so.1.19.0
+lib/libispcrt_device_cpu.so
+lib/libispcrt_device_cpu.so.1
+lib/libispcrt_device_cpu.so.1.20.0
 lib/libispcrt_static.a