mirror of
https://github.com/pyenv/pyenv.git
synced 2024-12-22 21:52:34 +00:00
Setup built-in patches out from stub functions of `{before,after}_install_package}.
This commit is contained in:
parent
2cea06b88a
commit
2c26b0870a
1 changed files with 9 additions and 9 deletions
|
@ -165,9 +165,11 @@ make_package() {
|
||||||
shift
|
shift
|
||||||
|
|
||||||
pushd "$package_name" >&4
|
pushd "$package_name" >&4
|
||||||
|
setup_builtin_patches "$package_name"
|
||||||
before_install_package "$package_name"
|
before_install_package "$package_name"
|
||||||
build_package "$package_name" $*
|
build_package "$package_name" $*
|
||||||
after_install_package "$package_name"
|
after_install_package "$package_name"
|
||||||
|
cleanup_builtin_patches "$package_name"
|
||||||
fix_directory_permissions
|
fix_directory_permissions
|
||||||
popd >&4
|
popd >&4
|
||||||
}
|
}
|
||||||
|
@ -699,10 +701,13 @@ build_package_copy() {
|
||||||
|
|
||||||
before_install_package() {
|
before_install_package() {
|
||||||
local stub=1
|
local stub=1
|
||||||
before_install_package_patch "$@"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
before_install_package_patch() {
|
after_install_package() {
|
||||||
|
local stub=1
|
||||||
|
}
|
||||||
|
|
||||||
|
setup_builtin_patches() {
|
||||||
local package_name="$1"
|
local package_name="$1"
|
||||||
local package_patch_path="${PYTHON_BUILD_ROOT}/share/python-build/patches/${DEFINITION_PATH##*/}/${package_name}"
|
local package_patch_path="${PYTHON_BUILD_ROOT}/share/python-build/patches/${DEFINITION_PATH##*/}/${package_name}"
|
||||||
|
|
||||||
|
@ -713,19 +718,14 @@ before_install_package_patch() {
|
||||||
{ for patch in "${package_patch_path}"/*; do
|
{ for patch in "${package_patch_path}"/*; do
|
||||||
[ -f "${patch}" ] && echo "${patch}"
|
[ -f "${patch}" ] && echo "${patch}"
|
||||||
done
|
done
|
||||||
} | sort | xargs cat -- 1>"${package_name}.patch"
|
} 2>/dev/null | sort | xargs cat 1>"${package_name}.patch"
|
||||||
exec <&-
|
exec <&-
|
||||||
exec <"${package_name}.patch"
|
exec <"${package_name}.patch"
|
||||||
HAS_PATCH=true
|
HAS_PATCH=true
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
after_install_package() {
|
cleanup_builtin_patches() {
|
||||||
local stub=1
|
|
||||||
after_install_package_patch "$@"
|
|
||||||
}
|
|
||||||
|
|
||||||
after_install_package_patch() {
|
|
||||||
local package_name="$1"
|
local package_name="$1"
|
||||||
rm -f "${package_name}.patch"
|
rm -f "${package_name}.patch"
|
||||||
HAS_PATCH="$ORIG_HAS_PATCH"
|
HAS_PATCH="$ORIG_HAS_PATCH"
|
||||||
|
|
Loading…
Reference in a new issue