Skip to content

Commit f6ad0ec

Browse files
author
Release Manager
committed
gh-39063: PKG_CONFIG must be empty if not found
Followup to #38954, where I followed the pkgconf documentation to set `PKG_CONFIG=false` if it is not found. But Sage uses `"test -z $PKG_CONFIG"`, so it must instead be set to empty. This causes pkgconf not to be built if pkgconf/pkg-config is not found. Which is basically only macOS. URL: #39063 Reported by: Volker Braun Reviewer(s):
2 parents bf16199 + d8078d3 commit f6ad0ec

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

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=4d6de7b4a5aff43a508a1e64078fe409554869fe
3-
sha256=18cc6fa95c0bd6ae0bf1f9b447ae2dd9da7d596d17bec5e961b980b9687e1a7e
2+
sha1=7d0d584233b0a52b62dba5eaeaac13d8c38652eb
3+
sha256=02d5e5ee0fad7ccbc99ae92ecb7cfc92260962cb1c8714c6fcd2f561c3d718e6
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
68f446ad3f1abcea6e1a9b679a04242597f439f6
1+
a60f0455273de4b2b07878d92e8357d8d9a839c8

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ dnl Exit autoconf with exit code 16 in this case. This will be
222222
dnl caught by the bootstrap script.
223223
m4_exit(16)])
224224

225-
PKG_PROG_PKG_CONFIG([0.29], [PKG_CONFIG=false])
225+
PKG_PROG_PKG_CONFIG([0.29], [PKG_CONFIG=])
226226

227227
AC_CHECK_PROG(found_ranlib, ranlib, yes, no)
228228
if test x$found_ranlib != xyes

0 commit comments

Comments
 (0)