From nobody Tue Nov 30 18:53:10 2021 X-Original-To: dev-commits-ports-main@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 3D77518BC915; Tue, 30 Nov 2021 18:53:11 +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 4J3WZG6x84z3q4b; Tue, 30 Nov 2021 18:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 CDA6B1B982; Tue, 30 Nov 2021 18:53:10 +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 1AUIrA2v041623; Tue, 30 Nov 2021 18:53:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AUIrA98041622; Tue, 30 Nov 2021 18:53:10 GMT (envelope-from git) Date: Tue, 30 Nov 2021 18:53:10 GMT Message-Id: <202111301853.1AUIrA98041622@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Johannes M Dieterich Subject: git: 31637dc81773 - main - devel/oclgrind: update to 21.10 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jmd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31637dc81773fce2b313ec59036a546d5d22edae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638298391; 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=Wgh/ogdacL0rQ9+8elEABPp4qKbS7u3XxKutw0HnuBo=; b=xBR+yO4XHuAGaH25lGVcOijFw3aSWrbubzV4bLWUi4AveJz1mUQSJ+kVSVCw5rHqUT8Ckc 0gNcV8O8Vha6aAAgjqXZh9w5YCD5h2M3zs82LAJ7/BAnZt7t6W5DOmGv4t/zp+FOfrYkK9 tyg3AfGR1ACGn6UmhGwKLpNzMEz7CEd/hKGaIej3xtCcdN7xwQzCjsIs6UApiplQyhK7uT EHmJJzqCG/6qTds6VwLecuDOC+8nrgyCv1jjYQzhYTyrDAuhDwL1Y4mzrcYF9iRem5dmTP DKFfvTO3OxOBf774FvD2hNXkiKoLHBHyIONUyMzyhcXBMu2Lmm6fcDvkGuwhmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638298391; a=rsa-sha256; cv=none; b=ZKIZbIlj+oc+XmnJ8ihblzKkwjGoonDjyUar5TUydvkOsXZD6upsHMnlfy2v0iA0X4H6F/ v7H+dIXj16LO0eOQ7osKxGmxIVT3Kfq5feOrt/09EjaT+xNRAjjqMxNdXsFdGOO/uyB+rl AB4UFXt7dDG897PYqCYHJxveRfsT0OY8LEoHnTUJEpSkYUrh18WNY6N1PtGebeC4V+1Kg8 JPr6pt1wrWBMkm5qeK/8U6D6Le7JKgLSC4eo9cUq4Fgj2dRbKAJ8KRusP1IRINKbvPbM9k ic0aRPzWnaFCNOzllwJHjaxy3L29hB+knOr7dyqnBxN5F17TYFoDHEhQ6NJrKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jmd: URL: https://cgit.FreeBSD.org/ports/commit/?id=31637dc81773fce2b313ec59036a546d5d22edae commit 31637dc81773fce2b313ec59036a546d5d22edae Author: Johannes M Dieterich AuthorDate: 2021-11-30 18:49:41 +0000 Commit: Johannes M Dieterich CommitDate: 2021-11-30 18:53:02 +0000 devel/oclgrind: update to 21.10 Changelog: https://github.com/jrprice/Oclgrind/releases/tag/v21.10 Update LLVM dependency to LLVM12 - minimum LLVM11 is required upstream. Remove powerpc special casing in-line with comment (LLVM >9) Add pkg-message that procfs(5) is required. Clean pkg-descr whitespace. --- devel/oclgrind/Makefile | 27 ++++++++++----------------- devel/oclgrind/distinfo | 6 +++--- devel/oclgrind/files/patch-CMakeLists.txt | 13 +++++++++++-- devel/oclgrind/pkg-descr | 10 +++++----- devel/oclgrind/pkg-message | 15 +++++++++++++++ devel/oclgrind/pkg-plist | 2 +- 6 files changed, 45 insertions(+), 28 deletions(-) diff --git a/devel/oclgrind/Makefile b/devel/oclgrind/Makefile index ada317e518f6..7acaf2ec4748 100644 --- a/devel/oclgrind/Makefile +++ b/devel/oclgrind/Makefile @@ -1,9 +1,9 @@ # Created by: Johannes Dieterich PORTNAME= oclgrind -PORTVERSION= 20190907 +PORTVERSION= 21.10 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= devel MAINTAINER= jmd@FreeBSD.org @@ -12,30 +12,23 @@ COMMENT= SPIR interpreter and virtual OpenCL device simulator LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +LLVM_VER= 12 BUILD_DEPENDS= opencl>=0:devel/opencl \ - llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} + llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} LIB_DEPENDS= libOpenCL.so:devel/ocl-icd -RUN_DEPENDS= opencl>=0:devel/opencl +RUN_DEPENDS= opencl>=0:devel/opencl \ + llvm${LLVM_VER}>=0:devel/llvm${LLVM_VER} USES= cmake USE_GITHUB= yes GH_ACCOUNT= jrprice GH_PROJECT= Oclgrind -GH_TAGNAME= e7c87b0 USE_LDCONFIG= yes -CC= clang${LLVM_DEFAULT} -CXX= clang++${LLVM_DEFAULT} -CPP= clang-cpp${LLVM_DEFAULT} +CC= clang${LLVM_VER} +CXX= clang++${LLVM_VER} +CPP= clang-cpp${LLVM_VER} -# to be removed after switching to LLVM 9 or later -CXXFLAGS_powerpc64= -mabi=elfv2 -CMAKE_ARGS+= -DLLVM_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/llvm - -.include - -.if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90 -LLVM_DEFAULT= 80 -.endif +CMAKE_ARGS+= -DLLVM_DIR=${LOCALBASE}/llvm${LLVM_VER}/lib/cmake/llvm/ .include diff --git a/devel/oclgrind/distinfo b/devel/oclgrind/distinfo index dabe435280d1..b9d4cf3923a0 100644 --- a/devel/oclgrind/distinfo +++ b/devel/oclgrind/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567897486 -SHA256 (jrprice-Oclgrind-v20190907-e7c87b0_GH0.tar.gz) = d9900578c320c430f2970423c6d2288f18f187a67d508c5b93295f1b422bc52c -SIZE (jrprice-Oclgrind-v20190907-e7c87b0_GH0.tar.gz) = 196630 +TIMESTAMP = 1638296132 +SHA256 (jrprice-Oclgrind-v21.10_GH0.tar.gz) = b40ea81fcf64e9012d63c3128640fde9785ef4f304f9f876f53496595b8e62cc +SIZE (jrprice-Oclgrind-v21.10_GH0.tar.gz) = 219855 diff --git a/devel/oclgrind/files/patch-CMakeLists.txt b/devel/oclgrind/files/patch-CMakeLists.txt index a17a44808ed4..c288b5dc294d 100644 --- a/devel/oclgrind/files/patch-CMakeLists.txt +++ b/devel/oclgrind/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2017-01-22 12:14:21 UTC +--- CMakeLists.txt.orig 2021-10-18 02:36:25 UTC +++ CMakeLists.txt -@@ -151,7 +151,7 @@ endif() +@@ -191,7 +191,7 @@ endif() # Check for library directory suffixes set(_LIBDIR_SUFFIX "") get_property(USING_LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) @@ -9,3 +9,12 @@ set(_LIBDIR_SUFFIX "64") endif() set(LIBDIR_SUFFIX "${_LIBDIR_SUFFIX}" +@@ -251,7 +251,7 @@ add_library(oclgrind ${CORE_LIB_TYPE} + src/plugins/Uninitialized.cpp) + target_link_libraries(oclgrind + PRIVATE ${CORE_EXTRA_LIBS} ${CLANG_LIBS} +- PUBLIC ${LLVM_LIBS}) ++ PUBLIC ${LLVM_LIBS} pthread) + + if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") + target_link_libraries(oclgrind PRIVATE Version) diff --git a/devel/oclgrind/pkg-descr b/devel/oclgrind/pkg-descr index d6cbf2de6dff..26e4e069de7a 100644 --- a/devel/oclgrind/pkg-descr +++ b/devel/oclgrind/pkg-descr @@ -2,11 +2,11 @@ Oclgrind SPIR interpreter and virtual OpenCL device simulator -Oclgrind implements a virtual OpenCL device simulator, including an OpenCL -runtime with ICD support. The goal is to provide a platform for creating tools -to aid OpenCL development. In particular, this project currently implements -utilities for debugging memory access errors, detecting data-races and barrier -divergence, collecting instruction histograms, and for interactive OpenCL +Oclgrind implements a virtual OpenCL device simulator, including an OpenCL +runtime with ICD support. The goal is to provide a platform for creating tools +to aid OpenCL development. In particular, this project currently implements +utilities for debugging memory access errors, detecting data-races and barrier +divergence, collecting instruction histograms, and for interactive OpenCL kernel debugging. The simulator is built on an interpreter for LLVM IR. WWW: https://github.com/jrprice/Oclgrind diff --git a/devel/oclgrind/pkg-message b/devel/oclgrind/pkg-message new file mode 100644 index 000000000000..645ed53d79ca --- /dev/null +++ b/devel/oclgrind/pkg-message @@ -0,0 +1,15 @@ +[ +{ type: install + message: <