From owner-svn-ports-all@freebsd.org Sat Mar 2 06:46:31 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3D4E415157A2; Sat, 2 Mar 2019 06:46:31 +0000 (UTC) (envelope-from yuri@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D302F8119A; Sat, 2 Mar 2019 06:46:30 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BE953F85; Sat, 2 Mar 2019 06:46:30 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x226kUnZ067552; Sat, 2 Mar 2019 06:46:30 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x226kUjV067549; Sat, 2 Mar 2019 06:46:30 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201903020646.x226kUjV067549@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sat, 2 Mar 2019 06:46:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494364 - in head/devel/ispc: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/devel/ispc: . files X-SVN-Commit-Revision: 494364 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D302F8119A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.93)[-0.929,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Mar 2019 06:46:31 -0000 Author: yuri Date: Sat Mar 2 06:46:29 2019 New Revision: 494364 URL: https://svnweb.freebsd.org/changeset/ports/494364 Log: devel/ispc: Unbreak by patching away LLVM's dump() functions that ISPC uses but which are not included in the LLVM packages Added: head/devel/ispc/files/patch-src_llvmutil.cpp (contents, props changed) head/devel/ispc/files/patch-src_opt.cpp (contents, props changed) Modified: head/devel/ispc/Makefile head/devel/ispc/files/patch-Makefile Modified: head/devel/ispc/Makefile ============================================================================== --- head/devel/ispc/Makefile Sat Mar 2 06:12:58 2019 (r494363) +++ head/devel/ispc/Makefile Sat Mar 2 06:46:29 2019 (r494364) @@ -4,6 +4,7 @@ PORTNAME= ispc DISTVERSIONPREFIX= v DISTVERSION= 1.10.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -11,8 +12,6 @@ COMMENT= Intel's compiler for high-performance SIMD pr LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -BROKEN= fails to build ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= only available for x86 architectures Modified: head/devel/ispc/files/patch-Makefile ============================================================================== --- head/devel/ispc/files/patch-Makefile Sat Mar 2 06:12:58 2019 (r494363) +++ head/devel/ispc/files/patch-Makefile Sat Mar 2 06:46:29 2019 (r494364) @@ -1,6 +1,15 @@ ---- Makefile.orig 2016-07-08 11:13:52 UTC +--- Makefile.orig 2019-01-19 01:23:04 UTC +++ Makefile -@@ -241,16 +241,16 @@ dirs: +@@ -113,7 +113,7 @@ endif + ifneq ($(NVPTX_ENABLED), 0) + LLVM_COMPONENTS+=nvptx + endif +-LLVM_LIBS=$(shell $(LLVM_CONFIG) --libs $(LLVM_COMPONENTS)) ++LLVM_LIBS=$(shell $(LLVM_CONFIG) --libs $(LLVM_COMPONENTS)) -lexecinfo + + CLANG=clang + CLANG_LIBS = -lclangFrontend -lclangDriver \ +@@ -249,16 +249,16 @@ dirs: @/bin/mkdir -p objs llvm_check: Added: head/devel/ispc/files/patch-src_llvmutil.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ispc/files/patch-src_llvmutil.cpp Sat Mar 2 06:46:29 2019 (r494364) @@ -0,0 +1,13 @@ +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 2019-03-02 06:20:14 UTC ++++ src/llvmutil.cpp +@@ -1550,7 +1550,7 @@ lDumpValue(llvm::Value *v, std::setdump(); ++ //v->dump(); + done.insert(v); + + if (inst == NULL) Added: head/devel/ispc/files/patch-src_opt.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ispc/files/patch-src_opt.cpp Sat Mar 2 06:46:29 2019 (r494364) @@ -0,0 +1,49 @@ +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 2019-03-02 06:22:00 UTC ++++ src/opt.cpp +@@ -173,7 +173,7 @@ static llvm::Pass *CreatePromoteLocalToP + strlen(getenv("FUNC"))))) { \ + fprintf(stderr, "Start of " NAME "\n"); \ + fprintf(stderr, "---------------\n"); \ +- bb.dump(); \ ++ /*bb.dump();*/ \ + fprintf(stderr, "---------------\n\n"); \ + } else /* eat semicolon */ + +@@ -184,7 +184,7 @@ static llvm::Pass *CreatePromoteLocalToP + 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 */ + +@@ -537,7 +537,7 @@ void + Optimize(llvm::Module *module, int optLevel) { + if (g->debugPrint) { + printf("*** Code going into optimization ***\n"); +- module->dump(); ++ //module->dump(); + } + DebugPassManager optPM; + optPM.add(llvm::createVerifierPass(),0); +@@ -932,7 +932,7 @@ Optimize(llvm::Module *module, int optLe + + if (g->debugPrint) { + printf("\n*****\nFINAL OUTPUT\n*****\n"); +- module->dump(); ++ //module->dump(); + } + + } +@@ -4895,7 +4895,7 @@ bool + DebugPass::runOnModule(llvm::Module &module) { + fprintf(stderr, "%s", str_output); + fflush(stderr); +- module.dump(); ++ //module.dump(); + return true; + } +