From nobody Sat Dec 10 18:22:31 2022 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 4NTx866yG8z4k6hZ; Sat, 10 Dec 2022 18:22:46 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NTx866P8Pz3Lpq; Sat, 10 Dec 2022 18:22:46 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670696566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Ks1zrvrd1fxlkkwE3KmsJuPCt0Rr2OvBlf/U1tgJ3dY=; b=JlNoCFU8qOV7P4xU2IIIVEXMCRBOx2yK4nZwtux+1/Qw1rM0lrzOW3vuEwhZ0U7pDfyJ9y DWpoOtmj3LMLDfHikCSkOTl2wErR2H2/uVxqdt8RySD0nqMI1Ymiq8VWCMoIpY42JA/T60 SejZSUnUvGQxxTlSWCdIe6VQngrFLEsltEaDzPXDj/SWv8zACS1hrjOvW5Z/NO1mR9IV3u 4LR+TT4jAkQzmBHXSVoE18SRQXzWHoubiZz83we/gqnaDkvewr/LhVgbLaoOIteECiy/mQ mvYwovS1k0UzWhoyBCykNrB1pw+sgdr1WjY8KEPQ1aehS+h2IzPM2cIdTSboBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670696566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Ks1zrvrd1fxlkkwE3KmsJuPCt0Rr2OvBlf/U1tgJ3dY=; b=agSW5NkkrYMsa43I5EWvJqY3k9/Js36+vekCgG8pgNrpvz+kwjUDrVpeuvqjRpsCR7NaVv DtoqG6NbQLHwfV8BPQS0DOJMnuWFjDeg7icClrIssfJqQjSdyV9S3Yb7XCXsZ4RnoUNg/F i+YLSBhQ/gtpT+XYGWIq44+JePiZ4nUfr9CZPQJEE3+bIczpq6rezgTw3PYmOTy/nG3Llf 44UFlAaelaYXj83LfDOK+WM3NyLLWVqjNiY/NRfXNxNBcS+F7i0+xy7HlKQ2HfhRw6LQaL 2vBwSwNFf5y/+rMR4hlvFC7/l9o0QL+sr7Qt8LuDevbCfWyX8VxrOjj/7n1IOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670696566; a=rsa-sha256; cv=none; b=WEYUummICWD9XeSouHm6iAmEQBb7qhTr1/PtPHqrysW1aOVAEVCO3Wa58hunSwC9n5xcZE K1N4k3bQm1J96XiFSMPSiakLui38mmgs1Ln3gs1LiZtPuOL1RzdSghSIAqzm9mVoMCoYeq XsnRmldHMIohp1r2BbuA1Uhx3YnH5pSkOemwwaLKwwb99x3dfAw28/L+L/P0hAnsVUIvpT GTaRPg0TzcrVUEOw15B1A6/Di6UmHHncJ/2BjYWashfSj1Iv6rvXI2+X/MSKD1Zp6+chea pAZQ+TZOzo/X0PPAR2H/0r/mq232t5An8SCoSt+jE+MidhbDcYQVYfM7kDqUEw== Received: by freefall.freebsd.org (Postfix, from userid 1354) id C877A1EF9B; Sat, 10 Dec 2022 18:22:46 +0000 (UTC) From: Jan Beich To: Emmanuel Vadot Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: e70ff172c205 - main - graphics/mesa*: Stop using meson native-file In-Reply-To: <202212081901.2B8J1XCU012269@gitrepo.freebsd.org> (Emmanuel Vadot's message of "Thu, 8 Dec 2022 19:01:33 GMT") References: <202212081901.2B8J1XCU012269@gitrepo.freebsd.org> Date: Sat, 10 Dec 2022 19:22:31 +0100 Message-ID: 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 X-ThisMailContainsUnwantedMimeParts: N Emmanuel Vadot writes: > Use BINARY_ALIAS instead, this is cleaner. > While here directly record the deps on libLLVM for packages that > needs it. See https://cgit.freebsd.org/ports/commit/?id=b460e08f9365 mesa-dri may accidentally end up using llvm >= 16 once meson adds '-16', '-17', etc. to the suffix list while more than one llvm* package is installed. To reproduce right now (with meson-0.64.1): 1. Lower pinned LLVM_DEFAULT back to 13 2. Install llvm13, llvm14, llvm15 3. Run "make clean configure" 4. Notice "llvm-version: 14.0.6" However, meson >= 0.64 supports LLVM_CONFIG variable which allows to avoid BINARY_ALIAS (e.g., 6df38243af67). diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common index f45f8d7250ff..b2ac1088bf5d 100644 --- a/graphics/mesa-dri/Makefile.common +++ b/graphics/mesa-dri/Makefile.common @@ -85,7 +85,7 @@ BINARY_ALIAS+= python3=${PYTHON_VERSION} LLVM_DEFAULT= 15 BUILD_DEPENDS+= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -BINARY_ALIAS+= llvm-config=llvm-config${LLVM_DEFAULT} +CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib MESON_ARGS+= -Dllvm=enabled