mirror of
https://github.com/pyenv/pyenv.git
synced 2024-12-22 21:32:39 +00:00
Merge branch 'enable-framework'
This commit is contained in:
commit
46a01b1643
1 changed files with 20 additions and 0 deletions
|
@ -1062,6 +1062,11 @@ apply_python_patch() {
|
||||||
build_package_verify_python() {
|
build_package_verify_python() {
|
||||||
local package_name="$1"
|
local package_name="$1"
|
||||||
local python="$2"
|
local python="$2"
|
||||||
|
if [[ "$PYTHON_CONFIGURE_OPTS" == *"--enable-framework"* ]]; then
|
||||||
|
# Only symlinks are installed in ${PREFIX_PATH}/bin
|
||||||
|
rm -fr "${PREFIX_PATH}/bin"
|
||||||
|
ln -fs "${PREFIX_PATH}/Python.framework/Versions/Current/bin" "${PREFIX_PATH}/bin"
|
||||||
|
fi
|
||||||
if [ ! -e "${PREFIX_PATH}/bin/python" ] && [ -e "${PREFIX_PATH}/bin/${python}" ]; then
|
if [ ! -e "${PREFIX_PATH}/bin/python" ] && [ -e "${PREFIX_PATH}/bin/${python}" ]; then
|
||||||
( cd "${PREFIX_PATH}/bin" && ln -fs "${python}" "python" )
|
( cd "${PREFIX_PATH}/bin" && ln -fs "${python}" "python" )
|
||||||
fi
|
fi
|
||||||
|
@ -1330,6 +1335,21 @@ if [[ "$CONFIGURE_OPTS" == *"--enable-shared"* ]] || [[ "$PYTHON_CONFIGURE_OPTS"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ "$PYTHON_CONFIGURE_OPTS" == *"--enable-framework"* ]]; then
|
||||||
|
create_framework_dirs() {
|
||||||
|
local version="$(echo "$1" | sed -E 's/^[^0-9]*([0-9]+\.[0-9]+).*$/\1/')"
|
||||||
|
mkdir -p "${PREFIX_PATH}/Python.framework/Versions/${version}"
|
||||||
|
( cd "${PREFIX_PATH}/Python.framework/Versions" && ln -fs "${version}" "Current")
|
||||||
|
local path
|
||||||
|
for path in include lib share; do
|
||||||
|
mkdir -p "${PREFIX_PATH}/Python.framework/Versions/Current/${path}"
|
||||||
|
ln -fs "${PREFIX_PATH}/Python.framework/Versions/Current/${path}" "${PREFIX_PATH}/${path}"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
create_framework_dirs "${DEFINITION_PATH##*/}"
|
||||||
|
package_option python configure --enable-framework="${PREFIX_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
SEED="$(date "+%Y%m%d%H%M%S").$$"
|
SEED="$(date "+%Y%m%d%H%M%S").$$"
|
||||||
LOG_PATH="${TMP}/python-build.${SEED}.log"
|
LOG_PATH="${TMP}/python-build.${SEED}.log"
|
||||||
PYTHON_BIN="${PREFIX_PATH}/bin/python"
|
PYTHON_BIN="${PREFIX_PATH}/bin/python"
|
||||||
|
|
Loading…
Reference in a new issue