ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-04-03 09:19:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

m4/ctng_python.m4: Fix library check
Some checks failed
CI / crosstool (macos-13) (push) Has been cancelled
Details
CI / crosstool (ubuntu-22.04) (push) Has been cancelled
Details
CI / tarballs (ubuntu-22.04) (push) Has been cancelled
Details
CI / toolchains (push) Has been cancelled
Details

Browse Source 
There is subtle difference between our CTNG_PYTHON and the AX_PYTHON on
which it is based. The latter uses AC_CHECK_PROGS() which sets
PYTHON_BIN to the name of the executable. We use AC_PATH_PROGS() which
sets PYTHON_BIN to the full path of the executable.

Because the name of the executable is the same as the library AX_PYTHON
uses this when looking for the library with AC_CHECK_LIB() which magics
itself into a linker flag like `-lpython3.11` but our version ends up
with a nonsensical `-l/usr/bin/python3.11` so the check fails and we
keep iterating repeating the same wrong check for every tested python
version.

We can't just switch to using AC_CHECK_PROGS() because we do want to use
the variable set by AC_PATH_PROGS() to set the full path in paths.sh.
Ultimately we could probably switch to using the upstream AX_PYTHON
macro (https://www.gnu.org/software/autoconf-archive/ax_python.html) and
figure out a better way of getting the full path of the exectuable but
for now add an extra AC_CHECK_PROGS() to set a different variable and
use that for AC_CHECK_LIB().

Signed-off-by: Chris Packham <judge.packham@gmail.com>
This commit is contained in:
Chris Packham 2025-01-22 09:54:58 +13:00
parent 93f5bc7ad3
commit 40c7e23be8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
m4/ctng_python.m4
View File

@ -64,11 +64,13 @@ AC_DEFUN([CTNG_PYTHON],
python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl
python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
AC_PATH_PROGS(PYTHON_BIN, [$python])
AC_CHECK_PROGS(PYTHON_BIN_, [$python])
ctng_python_bin=$PYTHON_BIN
ctng_python_bin_=$PYTHON_BIN_
if test "$ctng_python_bin" != ""; then
AC_CHECK_LIB($ctng_python_bin, main, ctng_python_lib=$ctng_python_bin, ctng_python_lib=no)
AC_CHECK_LIB($ctng_python_bin_, main, ctng_python_lib=$ctng_python_bin_, ctng_python_lib=no)
if test "$ctng_python_lib" = "no"; then
AC_CHECK_LIB(${ctng_python_bin}m, main, ctng_python_lib=${ctng_python_bin}m, ctng_python_lib=no)
AC_CHECK_LIB(${ctng_python_bin_}m, main, ctng_python_lib=${ctng_python_bin_}m, ctng_python_lib=no)
fi
if test "$ctng_python_lib" != "no"; then
$ctng_python_bin -c 'import sysconfig' 2>&1