From nobody Sun Apr 26 13:42:43 2026 X-Original-To: dev-commits-src-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 4g3SYv2PXPz6bklc for ; Sun, 26 Apr 2026 13:42:43 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g3SYv0nBPz3lq1 for ; Sun, 26 Apr 2026 13:42:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777210963; 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=z7E9wy0AN/IZJuk9YJHToiPGZfCV8tIs8IaTtQh/OPI=; b=drDIlndnkJN9AKkzHEu4iehiBWjHxUR7QFnFIKeFU2VUkqW+eX6yU4ecrULeSJR1v222ch AAjqRfBIONZntj9d9AJLc0c3sTDYYjNNsAkoGx5VjUzlm7y51Kq/thIzpec1d2QHy1Roam t2b7nWUaRSzwdf/tonn3Sg1J46CWkLP1BoHL7MQZ9qe9uZU6wWT7KUUfnNyWWubpjq6LQM nzODWQxSU3CBXniYgoLdZOGSG/082BjwkKlvtFpYZBjY+RqnkqtdsHefhMWZjd/RPJ8DVm tDcJCma2my8UThibshr/aXx970J40Dl6U9xnTK2eovfpV7e39VqHuOnb8tTe8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777210963; a=rsa-sha256; cv=none; b=OqCMyPOUXrAztyBpWNF2yy5l8OMI98Pttq4U7fG+B+urpw8XqZiYnbG1VyAG7wxOFcT/wo U/UilgTFSkufjXr8vlXRhgceFBY7mML3Agl1p44qlCpD5PwCpP+JSsbS9v9kPw6C6TIv8s vVXyeaplNLTQwuyXIQeu+Lt+t1oELa9VGUUNXGzWxNyeSgB0Aw1oK7LGdIoiX3vBGq7ZVM igV8yjdmr6E1em1Ni0ziGJ/8ELRHwtV+SPzmo5z/KtwOI+bxFGxszMtm5SDPcLBcDgcnv4 bVtG9TQ6fOYBkm9qvKVNJvZAhlOfAPsKZw1XlVoc2seSci3oIjz1Vvo8ZmtEQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777210963; 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=z7E9wy0AN/IZJuk9YJHToiPGZfCV8tIs8IaTtQh/OPI=; b=ht/zf02Bvv+QFzzmpIh5mV1iBOGxURKMOIC3wXbatQNrvguTjMnyAVzAvxF4eqdyx1mCZj dq6P9v2cLNfpvIXMJRTmGSi0CzWI4KAB52M295zIK/tL/I5dcWGqjjB5Vn40LZiliT4dFt EdNm8Ih+FVr4hsAHRbD4QerlNCmaNBahJ/6g4B8aDvzXcTLlZz44aH5KDQEPv+yiC4yI1F sXhISAj805I8+RczGV4fxwaqtoED9TkOuGN1R6keZpNFicIx6JuuN9fSLMrFAzUy+ME498 aYMmDxX+usZL9NG1lTXwR1aM8Z4xKaVNO9aOxepHdwbER6XDWR41qOBapzRwkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3SYv050Sz7Kt for ; Sun, 26 Apr 2026 13:42:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34850 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Apr 2026 13:42:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 4dd97955e68d - main - libpkgconf: Fix paths List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4dd97955e68df02b26d59e4e7c9a8167947a5164 Auto-Submitted: auto-generated Date: Sun, 26 Apr 2026 13:42:43 +0000 Message-Id: <69ee1653.34850.61462b24@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4dd97955e68df02b26d59e4e7c9a8167947a5164 commit 4dd97955e68df02b26d59e4e7c9a8167947a5164 Author: Dag-Erling Smørgrav AuthorDate: 2026-04-26 13:41:47 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-26 13:41:47 +0000 libpkgconf: Fix paths ${LOCALBASE:U} evaluates to exactly the same thing as ${LOCALBASE}. Presumably what was meant was ${LOCALBASE:U/usr/local}. Fixes: b8352da33f34 ("pkgconf: import into the base system") Reviewed by: khorben Differential Revision: https://reviews.freebsd.org/D56642 --- lib/libpkgconf/Makefile | 4 ++-- tools/build/depend-cleanup.sh | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/libpkgconf/Makefile b/lib/libpkgconf/Makefile index fee7f275d9ff..3cfb2172a00e 100644 --- a/lib/libpkgconf/Makefile +++ b/lib/libpkgconf/Makefile @@ -14,8 +14,8 @@ INCS= bsdstubs.h iter.h libpkgconf-api.h libpkgconf.h stdinc.h WARNS?= 3 -CFLAGS+= -DPERSONALITY_PATH=\"/usr/share/pkgconfig/personality.d:/etc/pkgconfig/personality.d:${LOCALBASE:U}/etc/pkgconfig/personality.d\" -CFLAGS+= -DPKG_DEFAULT_PATH=\"${LOCALBASE:U}/libdata/pkgconfig:/usr/libdata/pkgconfig:${LOCALBASE:U}/share/pkgconfig\" +CFLAGS+= -DPERSONALITY_PATH=\"/usr/share/pkgconfig/personality.d:/etc/pkgconfig/personality.d:${LOCALBASE:U/usr/local}/etc/pkgconfig/personality.d\" +CFLAGS+= -DPKG_DEFAULT_PATH=\"${LOCALBASE:U/usr/local}/libdata/pkgconfig:/usr/libdata/pkgconfig:${LOCALBASE:U/usr/local}/share/pkgconfig\" CFLAGS+= -DSYSTEM_INCLUDEDIR=\"/usr/include\" CFLAGS+= -DSYSTEM_LIBDIR=\"/usr/lib\" CFLAGS+= -I${SRCTOP}/lib/libpkgconf -I${PKGCONFDIR} diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index e9c02d015368..c186c39a3448 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -317,6 +317,10 @@ check_epoch_and_opts # "$OBJTOP"/tests/sys/kqueue/libkqueue/* #fi +# 20250426 # libpkgconfig contains incorrect paths +clean_obj lib/libpkgconf personality c pkgconfig:/share +clean_obj lib/libpkgconf pkg c pkgconfig:/share + # 20251219 # libkrb5profile is now internal for libcompat in "" $ALL_libcompats; do dirprfx=${libcompat:+obj-lib${libcompat}}