From owner-svn-ports-branches@freebsd.org Tue Sep 22 23:21:03 2020 Return-Path: Delivered-To: svn-ports-branches@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 458C83E4018; Tue, 22 Sep 2020 23:21:03 +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) 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 4Bwy3g15XSz3bvD; Tue, 22 Sep 2020 23:21:03 +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 08F2A26F55; Tue, 22 Sep 2020 23:21:03 +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 08MNL2SA085241; Tue, 22 Sep 2020 23:21:02 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08MNL2XD085240; Tue, 22 Sep 2020 23:21:02 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202009222321.08MNL2XD085240@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Tue, 22 Sep 2020 23:21:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r549644 - branches/2020Q3/misc/glow X-SVN-Group: ports-branches X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: branches/2020Q3/misc/glow X-SVN-Commit-Revision: 549644 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Sep 2020 23:21:03 -0000 Author: yuri Date: Tue Sep 22 23:21:02 2020 New Revision: 549644 URL: https://svnweb.freebsd.org/changeset/ports/549644 Log: MFH: r549625 misc/glow: Fix build on 13 Add the workaround for a bug in Glow that it uses the default C++ compiler when the supplied LLVM version is different. Reported by: fallout Approved by: ports-secteam (fluffy) Modified: branches/2020Q3/misc/glow/Makefile Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/misc/glow/Makefile ============================================================================== --- branches/2020Q3/misc/glow/Makefile Tue Sep 22 23:20:03 2020 (r549643) +++ branches/2020Q3/misc/glow/Makefile Tue Sep 22 23:21:02 2020 (r549644) @@ -34,6 +34,7 @@ CMAKE_ARGS= -DFREEBSD_LLVM_VERSION:STRING=${LLVM_VER} CMAKE_OFF= GLOW_BUILD_EXAMPLES GLOW_BUILD_TESTS BINARY_ALIAS= python=${PYTHON_CMD} +BINARY_ALIAS+= c++=${LOCALBASE}/bin/clang++${LLVM_VER:S/.//} # workaround for the llvm version mixup: https://github.com/pytorch/glow/issues/4910 LLVM_VER= ${LLVM_DEFAULT:C/(.)(.)/\1.\2/}