From nobody Sun Jan 15 07:39:27 2023 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 4Nvn9C5L6nz2t9cB; Sun, 15 Jan 2023 07:39:27 +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 4Nvn9C4WWpz45pd; Sun, 15 Jan 2023 07:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673768367; 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=4XoiWFJpZoDXvBRxg7wNjKMBVNdzYS9wUibWaDPDqr8=; b=Snu1THs4cgZwPrgY4cAPCmXIkq8U5MbdEw31GkOg2bd0d+dgn6QNaa17f7INQg9n9YOEgJ aSChk5Zndrd6NU5pjqUa5oXDLxySa39Lt9qgRvBUl/fWgGNW/0ZbtJdFzcnv4TI0WFYse4 DAyMK1cliOfU8dKKqIlPHao9fC0HbPCBnuKnWEdHtzL2UeHQHxukHJzXn1+h0M1C/QYW/l UrQULWY0EymmglJL3A1Um5C9CCIIWV0trx+8T/cJOUCw/gP72pdBvgx1ktnFwL9AuRMW0a pF453eBoGw7PBDgDUpgVIDOlLeYV5ZVhjwiAIYrgqeiEDETgq2qwV2BKSluxrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673768367; 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=4XoiWFJpZoDXvBRxg7wNjKMBVNdzYS9wUibWaDPDqr8=; b=Taxnrka3msh4LuTzo7py/OXeLzHs3yZKYPasyYwiJpfJ1zQGF60S4wTe2u7pCHptryqTZz EDMKJHT2mnLSWHJBinb1Z33B3RqtScbIwlXRl9pH6Xv6G4SRG3T2prkxAk4fdYyDNlHvn/ qUmxCDBIlkYZOds/zwPuYQLfPDuW3b1RPifJ6AQ4JxgJ3yyJDrTvVFIcvonXSe0Zaoz36d JACaSpvGrhmtV/OEaxa3wxsC0cZVQUWAFRKOodcMq8AE7jDyNjvxnVJhgUzWrIE9kaDJze 4nB6xNq9TJuhd5ccbVHXudCuA8Nx6JQa3VvNcSW7fQU+G5SlcOeeGTVqkDGUiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673768367; a=rsa-sha256; cv=none; b=T/gnleYBRQXL8RhrR9b/LJC6Jq3W/joyvhCd2fUvnpY7tD5mQpWMJG87+e967GLbH5EBWr mDKtae7Nm6n5pkzc5rPBB7wg9JoaPlMlnlqrVyp6maZ1AeHO0AKymmnz69k28bFe1cDo/p pTVikDCk44a4M/WLdHZow2bFFGFpoCDN6uOi7eXQN+sojmNN4bYfn8WvxbV2R59pSoNPga ZtE037yGNwrN3bHdZSz6GboaI5HGXUDs+Nyf6NWjqQc9omBMEoa6D8obRWvTdMlrvy6lvH lpE7jicleL5nzBYwG/LyI6bBKlfCJeNNlGIe/tcu7LI85ISgeXy371mrvTreHw== 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 4Nvn9C3Z6MzJwc; Sun, 15 Jan 2023 07:39:27 +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 30F7dRnH085217; Sun, 15 Jan 2023 07:39:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30F7dRXl085216; Sun, 15 Jan 2023 07:39:27 GMT (envelope-from git) Date: Sun, 15 Jan 2023 07:39:27 GMT Message-Id: <202301150739.30F7dRXl085216@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: ba6b714d44d7 - main - graphics/openshadinglanguage: remove outdated LLVM_VER handling 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba6b714d44d7ae1b7750101dba86df6b2aef76d2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba6b714d44d7ae1b7750101dba86df6b2aef76d2 commit ba6b714d44d7ae1b7750101dba86df6b2aef76d2 Author: Tobias C. Berner AuthorDate: 2023-01-15 07:33:17 +0000 Commit: Tobias C. Berner CommitDate: 2023-01-15 07:33:17 +0000 graphics/openshadinglanguage: remove outdated LLVM_VER handling --- graphics/openshadinglanguage/Makefile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile index 449269545d5b..c91f2a2db04f 100644 --- a/graphics/openshadinglanguage/Makefile +++ b/graphics/openshadinglanguage/Makefile @@ -16,13 +16,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md BROKEN_FreeBSD_12_powerpc64= fails to compile: llvm_ops.cpp:101:10: fatal error: 'iostream' file not found BROKEN_riscv64= fails to build: /usr/include/c++/v1/__threading_support:135:3: Unsupported architecture -BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} +BUILD_DEPENDS= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libImath.so:math/Imath \ libOpenEXR.so:graphics/openexr \ libOpenImageIO.so:graphics/openimageio \ libpugixml.so:textproc/pugixml -RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} +RUN_DEPENDS= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} USES= bison cmake compiler:c++14-lang localbase ncurses qt:5 @@ -34,7 +34,7 @@ GH_PROJECT= OpenShadingLanguage CMAKE_ON= ENABLERTTI OSL_BUILD_TESTS USE_LLVM_BITCODE USE_LIBCPLUSPLUS CMAKE_OFF= USE_BOOST_WAVE -CMAKE_ARGS+= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \ +CMAKE_ARGS+= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT}" \ -DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} -DCMAKE_CXX_STANDARD=14 OPTIONS_DEFINE= OSLTOY @@ -52,12 +52,6 @@ PLIST_SUB= SHL3=${PORTVERSION:R} SHL2=${PORTVERSION:R:R} .include -.if ${LLVM_DEFAULT:M[678]0} -LLVM_VER= 90 -.else -LLVM_VER= ${LLVM_DEFAULT} -.endif - post-patch: @${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \ -e 's,%%PYCMD%%,${PYTHON_CMD},' \