Skip to content

Commit

Permalink
sagemathgh-38954: Fix configure script generated by pkgconf-2.3.0
Browse files Browse the repository at this point in the history
Pkgconf 2.3.0 changes the PKG_PROG_PKG_CONFIG macro to error out instead
of marking it as not found. Arguably this is the correct default for
most but not for us, since we support building on macos where Apple, in
their infinite wisdom, decided not to ship their dev tools with it.

See also: https://github.com/pkgconf/pkgconf/blob/master/NEWS

    dnl PKG_PROG_PKG_CONFIG([MIN-VERSION], [ACTION-IF-NOT-FOUND])
    dnl ---------------------------------------------------------
    dnl Since: 0.16
    dnl
    dnl Search for the pkg-config tool and set the PKG_CONFIG variable
to
    dnl first found in the path. Checks that the version of pkg-config
found
    dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0
is
    dnl used since that's the first version where most current features
of
    dnl pkg-config existed.
    dnl
    dnl If pkg-config is not found or older than specified, it will
result
    dnl in an empty PKG_CONFIG variable. To avoid widespread issues with
    dnl scripts not checking it, ACTION-IF-NOT-FOUND defaults to
aborting.
    dnl You can specify [PKG_CONFIG=false] as an action instead, which
would
    dnl result in pkg-config tests failing, but no bogus error messages.

<!-- ^ Please provide a concise and informative title. -->
<!-- ^ Don't put issue numbers in the title, do this in the PR
description below. -->
<!-- ^ For example, instead of "Fixes sagemath#12345" use "Introduce new method
to calculate 1 + 2". -->
<!-- v Describe your changes below in detail. -->
<!-- v Why is this change required? What problem does it solve? -->
<!-- v If this PR resolves an open issue, please link to it here. For
example, "Fixes sagemath#12345". -->

### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. -->

- [ ] The title is concise and informative.
- [ ] 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,
-->
<!-- - sagemath#12345: short description why this is a dependency -->
<!-- - sagemath#34567: ... -->

URL: sagemath#38954
Reported by: Volker Braun
Reviewer(s):
  • Loading branch information
Release Manager committed Nov 10, 2024
2 parents a6f33a1 + f882056 commit 26f251d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions build/pkgs/configure/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
tarball=configure-VERSION.tar.gz
sha1=106668af2771091ca58a73fa7635aeedda9a158e
sha256=1d25b102f058a38423a05281d7051c8dc88a325fbdd0a2cc94c300da36f5eb56
sha1=23967083643ff1c938cb5887241c4a9bc5ab9fa2
sha256=d1375b8063e6f2b6f3852c281197770ee594adec04ec1582486b484fb57a2f40
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fca073d0d61407bd67d28e38ff2c18b8a73e5e27
e12e68c63ae51df5d0f5e87aeb319cd1572442c8
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ dnl Exit autoconf with exit code 16 in this case. This will be
dnl caught by the bootstrap script.
m4_exit(16)])

PKG_PROG_PKG_CONFIG([0.29])
PKG_PROG_PKG_CONFIG([0.29], [PKG_CONFIG=false])

AC_CHECK_PROG(found_ranlib, ranlib, yes, no)
if test x$found_ranlib != xyes
Expand Down

0 comments on commit 26f251d

Please sign in to comment.