Skip to content

Commit 7dc22de

Browse files
author
Release Manager
committed
gh-41104: never append ':' to the end of PKG_CONFIG_PATH in .homebrew-build-env
if `PKG_CONFIG_PATH` is not set, then `.homebrew-build-env` adds a spurious `:` at the end. We fix this here. ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [x] The title is concise and informative. - [x] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - #12345: short description why this is a dependency --> <!-- - #34567: ... --> URL: #41104 Reported by: Dima Pasechnik Reviewer(s): David Coudert
2 parents c154c72 + 56874aa commit 7dc22de

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

.homebrew-build-env

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ for l in bzip2 texinfo polymake; do
88
fi
99
done
1010
export PATH
11-
PKG_CONFIG_PATH="$HOMEBREW/lib/pkgconfig:$PKG_CONFIG_PATH"
11+
if [ -z "$PKG_CONFIG_PATH" ]; then
12+
PKG_CONFIG_PATH="$HOMEBREW/lib/pkgconfig"
13+
else
14+
PKG_CONFIG_PATH="$HOMEBREW/lib/pkgconfig:$PKG_CONFIG_PATH"
15+
fi
1216
# libpng.pc depends on zlib.pc
1317
for l in openblas openssl readline sqlite zlib; do
1418
if [ -d "$HOMEBREW/opt/$l/lib/pkgconfig" ]; then

build/pkgs/configure/checksums.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=22617a1a12a247801d8cbf658f7df9978034e1a9
3-
sha256=fae518a4a51179e16965cbc55eb40a9b6ee89db7d81b5f7d9d0466262611b8a1
2+
sha1=351d5784c8d94f333ad5c9e66943dfce02a101a1
3+
sha256=72f00f33aea96f11cbf53696e58845875059c306e50dd111b1ce9399abc3b230
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ad729a3fe96044ea67fc1f78ea2e0bf2706f29eb
1+
f186eec17539fa2c1f23ca75f06e6b5c0c08d60d

0 commit comments

Comments
 (0)