diff options
| author | Fabian Dellwing <fabian.dellwing@gmail.com> | 2023-04-21 20:24:10 +0200 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2023-04-22 12:56:36 +0100 |
| commit | 16ef5e26310f6c5239993ffdd0f63892e1d14956 (patch) | |
| tree | 248e3c57f4739bf20090f64463a3804252e4571a /Ports | |
| parent | 8da0a345153b9235739be6f1670f6e4643b52598 (diff) | |
| download | serenity-16ef5e26310f6c5239993ffdd0f63892e1d14956.zip | |
Ports: Prefer host python3.xx over python3
Previously we relied on the presence of a `python3` binary in the
PATH that has the correct minor version to build the port.
We now first check for the presence of a `python3.minor` binary
in the PATH and use that if found.
This allows users that have multiple Python versions installed
simultaneously (like from a PPA) to build the port without having
to change their main version.
Diffstat (limited to 'Ports')
| -rwxr-xr-x | Ports/python3/package.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Ports/python3/package.sh b/Ports/python3/package.sh index eabe3c620a..79259b8c89 100755 --- a/Ports/python3/package.sh +++ b/Ports/python3/package.sh @@ -33,7 +33,6 @@ configopts=( '--disable-ipv6' '--enable-shared' '--without-ensurepip' - '--with-build-python=python3' 'ac_cv_file__dev_ptmx=no' 'ac_cv_file__dev_ptc=no' ) @@ -41,14 +40,18 @@ configopts=( export BLDSHARED="${CC} -shared" configure() { - run ./configure --host="${SERENITY_ARCH}-pc-serenity" --build="$($workdir/config.guess)" "${configopts[@]}" + run ./configure --host="${SERENITY_ARCH}-pc-serenity" "--with-build-python=${PYTHON_BIN}" --build="$($workdir/config.guess)" "${configopts[@]}" } # Note: The showproperty command is used when linting ports, we don't actually need python at this time. if [ "$1" != "showproperty" ]; then - if [ -x "$(command -v python3)" ]; then + PYTHON_BIN="python3" + PYTHON_VERSION_SHORT=$(echo $PYTHON_VERSION | cut -f1-2 -d".") + if [ -x "$(command -v python${PYTHON_VERSION_SHORT})" ]; then + PYTHON_BIN="python${PYTHON_VERSION_SHORT}" + elif [ -x "$(command -v ${PYTHON_BIN})" ]; then # Check if major and minor version of python3 are matching - if ! python3 -c "import sys; major, minor = map(int, '${PYTHON_VERSION}'.split('.')[:2]); sys.exit(not (sys.version_info.major == major and sys.version_info.minor == minor))"; then + if ! ${PYTHON_BIN} -c "import sys; major, minor = map(int, '${PYTHON_VERSION_SHORT}'.split('.')); sys.exit(not (sys.version_info.major == major and sys.version_info.minor == minor))"; then echo "Error: python3 version does not match needed version to build ${PYTHON_VERSION}" >&2 echo "Build this Python version on your host using Toolchain/BuildPython.sh or install it otherwise and try again." >&2 exit 1 |