diff options
| author | Chris Packham <judge.packham@gmail.com> | 2025-01-22 09:54:58 +1300 |
|---|---|---|
| committer | Chris Packham <judge.packham@gmail.com> | 2025-01-23 13:06:22 +1300 |
| commit | 40c7e23be89bfb47fbae28e1db46f524bf5b8ed0 (patch) | |
| tree | 8bd8eb8d2b6b231cda954aab14fde4d29542f804 | |
| parent | 93f5bc7ad3f9cb7bef9242aefabf23474a743359 (diff) | |
| download | crosstool-ng-40c7e23be89bfb47fbae28e1db46f524bf5b8ed0.tar.gz crosstool-ng-40c7e23be89bfb47fbae28e1db46f524bf5b8ed0.tar.bz2 crosstool-ng-40c7e23be89bfb47fbae28e1db46f524bf5b8ed0.zip | |
m4/ctng_python.m4: Fix library check
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>
| -rw-r--r-- | m4/ctng_python.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/m4/ctng_python.m4 b/m4/ctng_python.m4 index d2d48bce..2c3a1951 100644 --- a/m4/ctng_python.m4 +++ b/m4/ctng_python.m4 @@ -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 |