From nobody Sat May 06 13:04:18 2023 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 4QD76p3ZKgz49ZFc; Sat, 6 May 2023 13:04:18 +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 4QD76p3278z4GPV; Sat, 6 May 2023 13:04:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683378258; 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=33GP13uytJQkHrjcvAgOwEvGqNk8Gtrit3cdOvt7mWE=; b=sRcQbnteZfhwWvoEmpbhBczuGz7yv6vU5Gkvv/30UCpclPj+ZzW2chJM3vDcMiaqSaGF4a Otmyye0vSUTSjS1pxp2vEVnoMAfkH2/v40vtSgkg3wgLGR+TxDe6jxWPPvmcTfAtoZBsxe BPvy7h5+uKLBZvIpig3hU6wL/Ih246KuGuX/XSGHEj83fpdAdih6Hbzfc3hZGB5lWRj9RB fFI0N2azMnejFzIKjxoR90pbwgNW+oHWLo9b0d+/2+GUX/FNrlxwXqiN6/kZZ5uxJyL3ft lJQazFYua0ACT9z3tq2hOFKAGkg5w1hwP242D4mGxtxmdF5TE/F44bGheLxq2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683378258; 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=33GP13uytJQkHrjcvAgOwEvGqNk8Gtrit3cdOvt7mWE=; b=g5g71U00KiIC+hjCCBUWuyzfj3aC9o6ZOdwsVKof++yVsLTjDGuWEzgJAJ6PdXLykJJihP 7N6BGNbdah8AHMNsGFq6Ai5WEpOiyLCJO9fMEfuY/at+m9vW0p+qeyANVXEPPiI76PgeqK 2g8kKNuSu2N4dFUOs05Q57JsVGxy5AU80b5ncm+7WhErMzsKmjbpT90lPsYzEaoVbsqcyJ uOHyGGvVQPQqE+sLVIsxYwol+qfHfV1SCn7k/sY9r6Er0HAxVo3iUwfX8uBqAUFHOAgDxJ 5kHzRQc2yyN+jPMSKe1T/tJlz09qIG7JS2MtgYtFyCNyObhGe5fYDTCnPhx9dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683378258; a=rsa-sha256; cv=none; b=hUFYkQ7Af5K6d0TM+FSjrAi/wlCf8WFMNy8tsgPKrSDDvax9Kh6OI6cdKXxKfPXAiM+F08 u1KBDGpoQP4n79yWwre5nMcEEVfUHKTdQzg5IEVbchm8R5fLZzZqYTE8YAiW0B10526LM4 0j9ybtZ9XMuw4tE46NbxrQYNFYFg4Yyk0TZl/BJj/JHfNX1sdzM9AQjdsXjFVCe0uOkyw8 OFDiZ/enX+d8fVsnQUp96X3rb7/rZ3+dRTPXWNr77xwTV5G48AVqbE+4LQoKtADBktgL3F 9nJRCVSZwKhVMdtSyraEqWEva+BU0wjmzpF4V1GxqFvt4FOSBPxqptM7+nuQJQ== 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 4QD76p26Mqzcht; Sat, 6 May 2023 13:04:18 +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 346D4Ihc056465; Sat, 6 May 2023 13:04:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 346D4Irx056464; Sat, 6 May 2023 13:04:18 GMT (envelope-from git) Date: Sat, 6 May 2023 13:04:18 GMT Message-Id: <202305061304.346D4Irx056464@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: a8a9e7bbcea7 - main - devel/ocl-icd: Fix build after devel/opencl update 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8a9e7bbcea77ea4ce13972cf66e323b2a8adb56 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=a8a9e7bbcea77ea4ce13972cf66e323b2a8adb56 commit a8a9e7bbcea77ea4ce13972cf66e323b2a8adb56 Author: O. Hartmann AuthorDate: 2023-05-05 21:33:44 +0000 Commit: Fernando Apesteguía CommitDate: 2023-05-06 12:59:23 +0000 devel/ocl-icd: Fix build after devel/opencl update ocl-icd comes with a copy of Khrono's OpenCL headers. ocl-icd hasn't been updated since 8/2021, the copy of OpenCL headers is outdated and results in a compile error while compiling the port with most recent OpenCL headers 3.0.14 provided by Khronos. The patch simply provides withj the correct CONFIGURE_ARGS=--enable-official-khronos-headers to ensure the pickup of devel/opencl headers. PR: 271255 Reported by: leres@ Fixes: 0eb6406f6594 --- devel/ocl-icd/Makefile | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/devel/ocl-icd/Makefile b/devel/ocl-icd/Makefile index a059bddac127..f5631d76417b 100644 --- a/devel/ocl-icd/Makefile +++ b/devel/ocl-icd/Makefile @@ -1,6 +1,7 @@ PORTNAME= ocl-icd -DISTVERSIONPREFIX= v PORTVERSION= 2.3.1 +PORTREVISION= 1 +DISTVERSIONPREFIX= v CATEGORIES= devel MAINTAINER= ohartmann@walstatt.org @@ -10,28 +11,28 @@ WWW= https://github.com/OCL-dev/ocl-icd LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= opencl>3.0:devel/opencl +BUILD_DEPENDS= opencl>=3.0:devel/opencl USES= autoreconf gmake libtool localbase:ldflags pathfix ruby:build -USE_GITHUB= yes -GH_ACCOUNT= OCL-dev -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CPPFLAGS+= -DCL_TARGET_OPENCL_VERSION=300 +USE_GITHUB= yes +GH_ACCOUNT= OCL-dev +USE_LDCONFIG= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --enable-official-khronos-headers \ + --enable-custom-vendordir \ + --enable-pthread-once INSTALL_TARGET= install-strip -CONFIGURE_ARGS+=--disable-official-khronos-headers \ - --enable-custom-vendordir \ - --enable-pthread-once +CPPFLAGS+= -DCL_TARGET_OPENCL_VERSION=300 -OPTIONS_DEFINE= DOCS MANPAGES -OPTIONS_DEFAULT=MANPAGES -OPTIONS_SUB= yes +OPTIONS_DEFINE= DOCS MANPAGES +OPTIONS_DEFAULT= MANPAGES +OPTIONS_SUB= yes -MANPAGES_BUILD_DEPENDS= xmlto:textproc/xmlto \ - asciidoc:textproc/asciidoc +MANPAGES_BUILD_DEPENDS= asciidoc:textproc/asciidoc \ + xmlto:textproc/xmlto post-patch: @${REINPLACE_CMD} -e 's|/etc/|${LOCALBASE}/etc/|g' \