From nobody Sun Jul 30 22:59:33 2023 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 4RDcJg5Nnfz4pYNG; Sun, 30 Jul 2023 22:59:34 +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 4RDcJP4rgFz3xFq; Sun, 30 Jul 2023 22:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690757973; 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=O+x5Z4En4CbJmrGv9fPOSuLjvkfVxz/thQz3yOY0Sro=; b=ZXKwLC87EPGhH6XcTUlJkXguWOqKur3TC+fdILDp9f/8/c2H4V6fJedUAW/yZy9sy8vV/Q aJAmPDv2iW7sPM6+BdfY5AVVcjmDhhNqhH9bFm+CnKJ6IjGMJUCxmRcDaYR1NVBYgLKqxP O/jyqUm/L4KdjLR5wV+WZDHGg1eB4Y1he9em9W16rJUeRvPjS2wnUnST98+E8ESkolUf5c sRUYkqlwxNUKdJ611W0sL2maDbj2yWBfHClPlh17eSqmqejFq/kov77p+cjBaJ2xXHvwKm nV+qQUCShJMPV1qKVMqeTHQQm3P9m2oorgkxMjxNx4+INaFocKrLqFBpk8qePg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690757973; 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=O+x5Z4En4CbJmrGv9fPOSuLjvkfVxz/thQz3yOY0Sro=; b=ZFaiIeKQYWASWPkDJyG7uJVt0auLlwA6Uvo8J/+DkqHGbknyn8XkgsPTrEfA4zFNS6NKVL td8bkDplLLFwovlk63obfAL+UPHL+2buvCAnOsqzoCxsJxIB9LTrUVjD/rObyxZyaOIHfZ htf8e+1k0qCPoQwEsLiTYKE1vKIHxExy8Jig99x3i3DGcYH82s3KtidQ8ONKRc0hcEI++L W82XjQuf2MGHT/gcyXs06R/TcfPCPlRdJBIXQfWYFOYbD0OUOEuUozQYBMS5OGy2qD6Zox 5ro4UbZp+VnF7Gf5qp9PBnHra113oKIy2Qd4gxj8rMlZ+wr0rWcc/iFwD1uixg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690757973; a=rsa-sha256; cv=none; b=xg/yP5jwrM053KEZSy5AB8Fa2pArxMH32HVQQRD0LqZ3b9NlLzwz8kr9SwapJnumKV8hOw vg2QjKbzH4Hdb48AIIWjW7qUNM62GLd48gB1XJNhdo+t81/gm4dFLim7lgnsKY3afz9nm1 d/MILXfR/xZczfRyud+07yFPmgi9wWt458gUmugiLzJOWThDjKihprX+xQswxvhu3B/8pg t+8zgtWiznzO6IWx56U16laIiB+Ffsl/zazZkguPTlQAxXChWvGrW0qKLIpUrfTEJqBfJA H/UN6B5l38TmrnYrEsp/l4AfSP6RXKGlJldYKhwFr5FqjIg2UWYF+4oWCsWizw== 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 4RDcJP3TRxzXcQ; Sun, 30 Jul 2023 22:59:33 +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 36UMxXlp001088; Sun, 30 Jul 2023 22:59:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36UMxXvL001087; Sun, 30 Jul 2023 22:59:33 GMT (envelope-from git) Date: Sun, 30 Jul 2023 22:59:33 GMT Message-Id: <202307302259.36UMxXvL001087@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 08691f29f5c8 - main - Mk/Uses/pkgconfig.mk: add support for PKGCONFIG_PATHS 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; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08691f29f5c8d5040ccdda864e174ef1db529ca3 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=08691f29f5c8d5040ccdda864e174ef1db529ca3 commit 08691f29f5c8d5040ccdda864e174ef1db529ca3 Author: Andrew "RhodiumToad" Gierth AuthorDate: 2023-07-28 12:55:15 +0000 Commit: Robert Clausecker CommitDate: 2023-07-30 22:59:04 +0000 Mk/Uses/pkgconfig.mk: add support for PKGCONFIG_PATHS USES=pkgconfig now allows you to specify PKGCONFIG_PATHS to allow management of PKG_CONFIG_PATHS in a cooperative fashion. PR: 260960 Reported by: Martin Neubauer Approved by: bofh Differential Revision: https://reviews.freebsd.org/D40194 --- Mk/Uses/pkgconfig.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Mk/Uses/pkgconfig.mk b/Mk/Uses/pkgconfig.mk index 499be51f1336..671a4f0608c1 100644 --- a/Mk/Uses/pkgconfig.mk +++ b/Mk/Uses/pkgconfig.mk @@ -28,4 +28,20 @@ RUN_DEPENDS+= ${_PKGCONFIG_DEPENDS} IGNORE= USES=pkgconfig - invalid args: [${pkgconfig_ARGS}] specified . endif +_USES_POST+= pkgconfig +.endif + +.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PKGCONFIG_POST_MK) +_INCLUDE_USES_PKGCONFIG_POST_MK=yes + +# Provide a cooperative mechanism for managing PKG_CONFIG_PATH. +. if defined(PKGCONFIG_PATHS) +. if !${CONFIGURE_ENV:MPKG_CONFIG_PATH=*} && !${MAKE_ENV:MPKG_CONFIG_PATH=*} +CONFIGURE_ENV+= PKG_CONFIG_PATH=${PKGCONFIG_PATHS:ts:} +MAKE_ENV+= PKG_CONFIG_PATH=${PKGCONFIG_PATHS:ts:} +. else +DEV_WARNING+= "PKGCONFIG_PATHS was ignored due to conflict with CONFIGURE_ENV or MAKE_ENV" +. endif +. endif + .endif