From nobody Tue Dec 13 14:32:51 2022 X-Original-To: dev-commits-ports-all@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 4NWgvc05zVz4jjGZ; Tue, 13 Dec 2022 14:33:00 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (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 (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NWgvZ1zbmz3nQx; Tue, 13 Dec 2022 14:32:58 +0000 (UTC) (envelope-from manu@bidouilliste.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=fi227Frb; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com; dmarc=pass (policy=none) header.from=bidouilliste.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1670941975; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tckDLIiT5Zt76fUUrKDQIvk/ExK4JqvqfnjmzO4djv8=; b=fi227FrbbpN/Q+HPQjzl4LyvDtTJDu5ITZ8Rf0vwilqd+g2kq1gt+bU0C42NWwsoU50sba K28yFgrJW8+Wf9CjHkBw9Tz7SHWtCZR3kWlBApqgZFN0/ZoRG3qZNcuYUS3QG3W6tU/woz yRTcEFlehzgy23BAYDZ3vXrGsoSr8zY= Received: from skull.home.blih.net (lfbn-lyo-1-2174-135.w90-66.abo.wanadoo.fr [90.66.97.135]) by mx.blih.net (OpenSMTPD) with ESMTPSA id e33a2e04 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 13 Dec 2022 14:32:55 +0000 (UTC) Date: Tue, 13 Dec 2022 15:32:51 +0100 From: Emmanuel Vadot To: Jan Beich Cc: Emmanuel Vadot , 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 Message-Id: <20221213153251.12b4825cc96ddba7c4a9b747@bidouilliste.com> In-Reply-To: References: <202212081901.2B8J1XCU012269@gitrepo.freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; MV_CASE(0.50)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; R_SPF_ALLOW(-0.20)[+ip4:212.83.155.74/32]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-ports-main@FreeBSD.org,dev-commits-ports-all@FreeBSD.org]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROM(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_TWO(0.00)[2]; FREEFALL_USER(0.00)[manu]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[bidouilliste.com:+]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Queue-Id: 4NWgvZ1zbmz3nQx X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N On Sat, 10 Dec 2022 19:22:31 +0100 Jan Beich wrote: > 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 Thanks, feel free to commit this. -- Emmanuel Vadot