Fix broken setup_builtin_patches
This commit is contained in:
parent
7220044b49
commit
8fee82e456
@ -911,15 +911,12 @@ after_install_package() {
|
|||||||
|
|
||||||
setup_builtin_patches() {
|
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="${DEFINITION_PATH%/*}/patches/${DEFINITION_PATH##*/}/${package_name}"
|
||||||
|
|
||||||
ORIG_HAS_PATCH="$HAS_PATCH"
|
ORIG_HAS_PATCH="$HAS_PATCH"
|
||||||
# Apply built-in patches if patch was not given from stdin
|
# Apply built-in patches if patch was not given from stdin
|
||||||
if [ -z "$HAS_PATCH" ] && [ -d "${package_patch_path}" ]; then
|
if [ -z "$HAS_PATCH" ] && [ -d "${package_patch_path}" ]; then
|
||||||
local patch
|
{ find "${package_patch_path}" -maxdepth 1 -type f
|
||||||
{ for patch in "${package_patch_path}"/*; do
|
|
||||||
[ -f "${patch}" ] && echo "${patch}"
|
|
||||||
done
|
|
||||||
} 2>/dev/null | 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"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user