Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 Mar 2023 07:35:50 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: 4e0bb9078837 - main - =?utf-8?Q?devel/ispc:=20Update=201.18.1=20=E2=86=92=201.19.0?=
Message-ID:  <202303020735.3227ZomO083244@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=4e0bb9078837d43a3bad1a6337d116ec252cd686

commit 4e0bb9078837d43a3bad1a6337d116ec252cd686
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-03-02 06:20:02 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-03-02 07:35:43 +0000

    devel/ispc: Update 1.18.1 → 1.19.0
    
    Reported by:    portscout
---
 devel/ispc/Makefile                     | 13 ++-----
 devel/ispc/distinfo                     |  6 ++--
 devel/ispc/files/patch-src_llvmutil.cpp | 13 -------
 devel/ispc/files/patch-src_opt.cpp      | 64 ---------------------------------
 devel/ispc/pkg-plist                    | 18 +++++-----
 5 files changed, 14 insertions(+), 100 deletions(-)

diff --git a/devel/ispc/Makefile b/devel/ispc/Makefile
index d35bf9da8542..2a29d1ceab54 100644
--- a/devel/ispc/Makefile
+++ b/devel/ispc/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ispc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.18.1
+DISTVERSION=	1.19.0
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
 		m4:devel/m4
 LIB_DEPENDS=	libLLVM.so:devel/llvm${LLVM_VERSION}
 
-USES=		bison cmake compiler:c++14-lang python:build,test shebangfix
+USES=		bison cmake compiler:c++17-lang llvm:lib,min=15,max=15 python:build,test shebangfix
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
@@ -60,15 +60,6 @@ XE_PLIST_FILES=		include/ispcrt/ispcrt.h \
 			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)
-#LLVM_VERSION=	13
-#.else
-#LLVM_VERSION=	${LLVM_DEFAULT}
-#.endif
-
-LLVM_VERSION?=	13
-
 do-test: # all tests pass
 	@cd ${WRKSRC} && ISPC_HOME=${BUILD_WRKSRC}/bin ./run_tests.py
 
diff --git a/devel/ispc/distinfo b/devel/ispc/distinfo
index 6726339674fd..1e5a1d18591a 100644
--- a/devel/ispc/distinfo
+++ b/devel/ispc/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1666763890
-SHA256 (ispc-ispc-v1.18.1_GH0.tar.gz) = 5b004c121e7a39c8654bb61930a240e4bd3e432a80d851c6281fae49f9aca7b7
-SIZE (ispc-ispc-v1.18.1_GH0.tar.gz) = 19471197
+TIMESTAMP = 1677733094
+SHA256 (ispc-ispc-v1.19.0_GH0.tar.gz) = da1eccb8ead495b22d642340f3bab11fb64dd2223cd9cc92f0492f70b30f34b5
+SIZE (ispc-ispc-v1.19.0_GH0.tar.gz) = 19577782
 SHA256 (google-googletest-6a7ed31_GH0.tar.gz) = f488bc430d2b5fdbc51711b142fd50dbf0f33012fa65c5f8e7d4f908ed935bcf
 SIZE (google-googletest-6a7ed31_GH0.tar.gz) = 904250
diff --git a/devel/ispc/files/patch-src_llvmutil.cpp b/devel/ispc/files/patch-src_llvmutil.cpp
deleted file mode 100644
index 53e2d9708916..000000000000
--- a/devel/ispc/files/patch-src_llvmutil.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-ISPC devs insist on using dump() functions which LLVM devs consider a debug functionality, and it isn't available in the LLVM packages.
-
---- src/llvmutil.cpp.orig	2022-01-15 08:35:15 UTC
-+++ src/llvmutil.cpp
-@@ -1458,7 +1458,7 @@ static void lDumpValue(llvm::Value *v, std::set<llvm::
-         return;
- 
-     fprintf(stderr, "  ");
--    v->dump();
-+    //v->dump();
-     done.insert(v);
- 
-     if (inst == NULL)
diff --git a/devel/ispc/files/patch-src_opt.cpp b/devel/ispc/files/patch-src_opt.cpp
deleted file mode 100644
index d396f5dbd312..000000000000
--- a/devel/ispc/files/patch-src_opt.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-ISPC devs insist on using dump() functions which LLVM devs consider a debug functionality, and it isn't available in the LLVM packages.
-
---- src/opt.cpp.orig	2022-01-15 08:35:15 UTC
-+++ src/opt.cpp
-@@ -155,7 +155,7 @@ static llvm::Pass *CreateMangleOpenCLBuiltins();
-                                                                        getenv("FUNC"), strlen(getenv("FUNC")))))) {    \
-         fprintf(stderr, "Start of " NAME "\n");                                                                        \
-         fprintf(stderr, "---------------\n");                                                                          \
--        bb.dump();                                                                                                     \
-+        /*bb.dump();*/                                                                                                     \
-         fprintf(stderr, "---------------\n\n");                                                                        \
-     } else /* eat semicolon */
- 
-@@ -165,7 +165,7 @@ static llvm::Pass *CreateMangleOpenCLBuiltins();
-                                                                        getenv("FUNC"), strlen(getenv("FUNC")))))) {    \
-         fprintf(stderr, "End of " NAME " %s\n", modifiedAny ? "** CHANGES **" : "");                                   \
-         fprintf(stderr, "---------------\n");                                                                          \
--        bb.dump();                                                                                                     \
-+        /*bb.dump();*/                                                                                                     \
-         fprintf(stderr, "---------------\n\n");                                                                        \
-     } else /* eat semicolon */
- #else
-@@ -467,7 +467,7 @@ void ispc::Optimize(llvm::Module *module, int optLevel
- #ifndef ISPC_NO_DUMPS
-     if (g->debugPrint) {
-         printf("*** Code going into optimization ***\n");
--        module->dump();
-+        //module->dump();
-     }
- #endif
-     DebugPassManager optPM;
-@@ -811,7 +811,7 @@ void ispc::Optimize(llvm::Module *module, int optLevel
- #ifndef ISPC_NO_DUMPS
-     if (g->debugPrint) {
-         printf("\n*****\nFINAL OUTPUT\n*****\n");
--        module->dump();
-+        //module->dump();
-     }
- #endif
- }
-@@ -1933,11 +1933,11 @@ lExtractUniformsFromOffset(llvm::Value **basePtr, llvm
-                            llvm::Value *offsetScale,
-                            llvm::Instruction *insertBefore) {
- #if 1
--    (*basePtr)->dump();
-+    //(*basePtr)->dump();
-     printf("\n");
--    (*offsetVector)->dump();
-+    //(*offsetVector)->dump();
-     printf("\n");
--    offsetScale->dump();
-+    //offsetScale->dump();
-     printf("-----\n");
- #endif
- 
-@@ -4746,7 +4746,7 @@ char DebugPass::ID = 0;
- bool DebugPass::runOnModule(llvm::Module &module) {
-     fprintf(stderr, "%s", str_output);
-     fflush(stderr);
--    module.dump();
-+    //module.dump();
-     return true;
- }
- 
diff --git a/devel/ispc/pkg-plist b/devel/ispc/pkg-plist
index f9b66253e9a0..2ac46c01cd31 100644
--- a/devel/ispc/pkg-plist
+++ b/devel/ispc/pkg-plist
@@ -3,15 +3,15 @@ bin/ispc
 include/ispcrt/ispcrt.h
 include/ispcrt/ispcrt.hpp
 include/ispcrt/ispcrt.isph
-lib/cmake/ispcrt-1.18.1/Finddpcpp_compiler.cmake
-lib/cmake/ispcrt-1.18.1/Findlevel_zero.cmake
-lib/cmake/ispcrt-1.18.1/interop.cmake
-lib/cmake/ispcrt-1.18.1/ispc.cmake
-lib/cmake/ispcrt-1.18.1/ispcrtConfig.cmake
-lib/cmake/ispcrt-1.18.1/ispcrtConfigVersion.cmake
-lib/cmake/ispcrt-1.18.1/ispcrt_Exports-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/ispcrt-1.18.1/ispcrt_Exports.cmake
+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/libispcrt.so
 lib/libispcrt.so.1
-lib/libispcrt.so.1.18.1
+lib/libispcrt.so.1.19.0
 lib/libispcrt_static.a



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303020735.3227ZomO083244>