From owner-svn-ports-all@freebsd.org Mon Jun 8 09:55:39 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 79ECA329F4E; Mon, 8 Jun 2020 09:55:39 +0000 (UTC) (envelope-from manu@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 49gTCH2jvWz46JQ; Mon, 8 Jun 2020 09:55:39 +0000 (UTC) (envelope-from manu@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 58296225F4; Mon, 8 Jun 2020 09:55:39 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0589tdeq049628; Mon, 8 Jun 2020 09:55:39 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0589tdWe049627; Mon, 8 Jun 2020 09:55:39 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202006080955.0589tdWe049627@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Mon, 8 Jun 2020 09:55:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538207 - head/graphics/mesa-dri X-SVN-Group: ports-head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/graphics/mesa-dri X-SVN-Commit-Revision: 538207 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.33 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: Mon, 08 Jun 2020 09:55:39 -0000 Author: manu Date: Mon Jun 8 09:55:38 2020 New Revision: 538207 URL: https://svnweb.freebsd.org/changeset/ports/538207 Log: mesa*: Switch to using a native-file for llvm Meson seems to not care that a llvm-config binary exists and will prefer to use llvm-config-devel for some reason. Using a native-file fixes that and meson will correctly use the llvm specified in it. PR: 247026 Approved by: zeising (x11@ implicit) Modified: head/graphics/mesa-dri/Makefile.common head/graphics/mesa-dri/Makefile.targets Modified: head/graphics/mesa-dri/Makefile.common ============================================================================== --- head/graphics/mesa-dri/Makefile.common Mon Jun 8 09:32:54 2020 (r538206) +++ head/graphics/mesa-dri/Makefile.common Mon Jun 8 09:55:38 2020 (r538207) @@ -100,7 +100,7 @@ BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llv .if ${COMPONENT} != libs RUN_DEPENDS+= llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llvm${LLVM_DEFAULT} .endif -BINARY_ALIAS+= llvm-config=llvm-config${LLVM_DEFAULT} +MESON_ARGS+= --native-file="${WRKSRC}/llvm.ini" LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib MESON_ARGS+= -Dllvm=true .endif Modified: head/graphics/mesa-dri/Makefile.targets ============================================================================== --- head/graphics/mesa-dri/Makefile.targets Mon Jun 8 09:32:54 2020 (r538206) +++ head/graphics/mesa-dri/Makefile.targets Mon Jun 8 09:55:38 2020 (r538207) @@ -2,6 +2,11 @@ # # this file holds common targets +pre-configure: + ${PRINTF} "[binaries]\nllvm-config = '${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT}'" \ + > ${WRKSRC}/llvm.ini + + post-patch: @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \ ${WRKSRC}/src/util/xmlconfig.c