From owner-svn-ports-all@freebsd.org Tue Nov 17 02:10:43 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CF9FB47B4B8; Tue, 17 Nov 2020 02:10:43 +0000 (UTC) (envelope-from fluffy@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CZqD35bh9z3D8J; Tue, 17 Nov 2020 02:10:43 +0000 (UTC) (envelope-from fluffy@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 B2E641850F; Tue, 17 Nov 2020 02:10:43 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AH2AhiP048906; Tue, 17 Nov 2020 02:10:43 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AH2Ahps048904; Tue, 17 Nov 2020 02:10:43 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202011170210.0AH2Ahps048904@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Tue, 17 Nov 2020 02:10:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r555532 - in head/graphics: blender openshadinglanguage X-SVN-Group: ports-head X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: in head/graphics: blender openshadinglanguage X-SVN-Commit-Revision: 555532 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 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: Tue, 17 Nov 2020 02:10:43 -0000 Author: fluffy Date: Tue Nov 17 02:10:43 2020 New Revision: 555532 URL: https://svnweb.freebsd.org/changeset/ports/555532 Log: graphics/blender and graphics/openshadinglanguage: respect LLVM_DEFAULT PR: 250990 Submitted by: vvd@unislabs.com Approved by: maintainer Modified: head/graphics/blender/Makefile head/graphics/openshadinglanguage/Makefile Modified: head/graphics/blender/Makefile ============================================================================== --- head/graphics/blender/Makefile Tue Nov 17 01:45:11 2020 (r555531) +++ head/graphics/blender/Makefile Tue Nov 17 02:10:43 2020 (r555532) @@ -51,7 +51,6 @@ LDFLAGS+= -fuse-ld=lld .endif PLIST_SUB+= VER=${DISTVERSION:R} -LLVM_VER= 90 OPTIONS_SUB= yes .include "${.CURDIR}/Makefile.options" @@ -162,6 +161,14 @@ XF86VMODE_USE= XORG=xi,xxf86vm .if defined(WITH_DEBUG) CMAKE_ARGS+= -DWITH_GHOST_DEBUG:BOOL=ON +.endif + +.include + +.if ${LLVM_DEFAULT:M[678]0} +LLVM_VER= 90 +.else +LLVM_VER= ${LLVM_DEFAULT} .endif post-patch-OPENCOLORIO-on: Modified: head/graphics/openshadinglanguage/Makefile ============================================================================== --- head/graphics/openshadinglanguage/Makefile Tue Nov 17 01:45:11 2020 (r555531) +++ head/graphics/openshadinglanguage/Makefile Tue Nov 17 02:10:43 2020 (r555532) @@ -33,11 +33,10 @@ GH_PROJECT= OpenShadingLanguage LDFLAGS+= -fuse-ld=lld .endif -LLVM_VER= 90 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}" \ - -DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} + -DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} -DCMAKE_CXX_STANDARD=14 # This flag fixes linking with clang 9.0 ?? CXXFLAGS+= -DNDEBUG @@ -59,6 +58,12 @@ CXXFLAGS+= -I${STAGEDIR}/include PLIST_SUB+= LIBVERS=${DISTVERSION:C/([0-9]*)\.([0-9]*)\.([0-9]*)(.*)/\1.\2.\3/} .include + +.if ${LLVM_DEFAULT:M[678]0} +LLVM_VER= 90 +.else +LLVM_VER= ${LLVM_DEFAULT} +.endif post-patch: @${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \