From nobody Mon Dec 04 08:55:10 2023 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 4SkHYW2BHvz5375j; Mon, 4 Dec 2023 08:55:11 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SkHYW1Q4jz3dc1; Mon, 4 Dec 2023 08:55:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701680111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vtQtCSZVj9TQDjw4JuEmQRfMW7zu5dZ7CGmpvLMEI9M=; b=oF6AoW+ZRjuvwQ8ma9sc9S/wnKcMz1VkucP9WnSK0iHA3ZH+YcWyRxLLwv0gNosC6ErpWo HqUewWoCCHUpTVuYWeKfn2QP8SENwuGUJbfjt36GwyvnHko3FOPHXp9y3KUrwe9Aw+rY93 ESKs3LmjDk8wdVXBSSlVc1lrclKZ1CixB9jm2VqGbY5NrGjM+Ps/uBsanecd9FQGOIL3Y0 Z5MWqwLGYKru+kZbj6cDELTwLMHQbWgyR3g+o4HQ1GXRBcOoYBoBgh4OucvP2yglQMA4Yf 9QBEBv4vslrd1+PYr+imfxQCBxwqPnuTzpaxu4//MgR7DjJCf7NLKg0lp06s0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701680111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vtQtCSZVj9TQDjw4JuEmQRfMW7zu5dZ7CGmpvLMEI9M=; b=lDYtglK3bvdAuzrKcFTbYKoXF7JO0fqMTRyw/Dk3JAMsvKt35Dp0b6ffnIFDZYDjnlGL9y w/oXsCN3LU9/u5kJgPBForLrku8SAKxZUn86tadafcbcEWRQlKgZcEX6bLDliLqERsGqAB 9PdTrg9V1tCgXM/EBHt8N5OXmQMDYwvFMejMu5rqyOg30gKcP09OjBLrx9+KULyA6yWigW V8mDYOqpZqj7D75wD+6dcUPHm9hxuLuX1BNXma2Xk+2GSuHVXhWtrVdhzWMPqFheCnSvTW fccGOXuQDcjoZF3BId7FhyG6X6tZI0Hg7fV1+kTAVsUqI/3ZCLritq/20hu0Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701680111; a=rsa-sha256; cv=none; b=ZmneX5SwWXTkj2vW8hi3kkBsc/GhlV/N9tIPzkOzuvWZTHoVUspU38qPTZuvBl1/+0n/yo ifMbQUIMB3LN0AdfEM8djPeMFUbpH+1JRr1c9actPC7Bk6Vv0+u0Yfys72DxYTkW7zEULU uIByDUOLF78KfXxhQkzkV5TZu54Gog5QrYmFzrBJf8QNOT/XdV26/VZwWExjytTkpDZeID jT7LZL6hX05sWBtWR3Orw+eYmeoKMb8xJGDgufc7EiZ96q2EdmMMgl0GuF3ExqhYxKFxi5 fJlDdACL45fGQ7kwvGBiri3heg+sT/I3pRaYPTQtovymylE+/BK/cg6YFb4QlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SkHYW0SP7z56F; Mon, 4 Dec 2023 08:55:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B48tAdC041419; Mon, 4 Dec 2023 08:55:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B48tAv1041416; Mon, 4 Dec 2023 08:55:10 GMT (envelope-from git) Date: Mon, 4 Dec 2023 08:55:10 GMT Message-Id: <202312040855.3B48tAv1041416@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 9f41e650f564 - main - graphics/mesa: Fix port when elfutils is installed 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f41e650f5645f1e50d8e51eb53ea231ff9f5149 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=9f41e650f5645f1e50d8e51eb53ea231ff9f5149 commit 9f41e650f5645f1e50d8e51eb53ea231ff9f5149 Author: Emmanuel Vadot AuthorDate: 2023-12-04 08:51:25 +0000 Commit: Emmanuel Vadot CommitDate: 2023-12-04 08:55:01 +0000 graphics/mesa: Fix port when elfutils is installed By default when building in a clean env (i.e. poudriere) libelf from base will be used. When building with an unclean env and if devel/elfutils is installed build system will be confused and use libelf headers from ${LOCALBASE}/include but libelf from base. Fix this. Sponsored by: Beckhoff Automation GmbH & Co. KG PR: 275388 --- graphics/mesa-dri/Makefile.common | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common index 9c76d24a46a9..aee858a5e9d2 100644 --- a/graphics/mesa-dri/Makefile.common +++ b/graphics/mesa-dri/Makefile.common @@ -81,6 +81,14 @@ BINARY_ALIAS+= python3=${PYTHON_VERSION} CONFIGURE_ENV+= LLVM_CONFIG=${LLVM_CONFIG} +# Deal with unclean env if the user have elfutils installed +# and build the port directly without poudriere +.if exists(${LOCALBASE}/include/libelf.h) +LIB_DEPENDS+= libelf.so:devel/elfutils +MESON_ARGS+= -Dlibelf=enabled +.else +MESON_ARGS+= -Dlibelf=disabled +.endif # Some symbols in mesa's linker version scripts are not always defined, # depending on configuration options. Suppress errors with lld >= 17 due to @@ -89,5 +97,4 @@ LDFLAGS+= -Wl,--undefined-version LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${LLVM_VERSION}/lib MESON_ARGS+= -Dllvm=enabled \ - -Dlibunwind=disabled \ - -Dlibelf=disabled + -Dlibunwind=disabled