mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-01-20 03:36:37 +00:00
Merge branch 'general-package-patches' of git://github.com/foss-for-synopsys-dwc-arc-processors/crosstool-ng into master
This commit is contained in:
commit
5bc58e2027
@ -2233,6 +2233,7 @@ CT_DoExtractPatch()
|
||||
local archive ext
|
||||
local -a patch_dirs
|
||||
local bundled_patch_dir
|
||||
local bundled_common_patch_dir
|
||||
local local_patch_dir
|
||||
local overlay
|
||||
|
||||
@ -2307,13 +2308,14 @@ CT_DoExtractPatch()
|
||||
CT_DoExecLog ALL touch "${src_dir}/.${basename}.patching"
|
||||
|
||||
bundled_patch_dir="${CT_LIB_DIR}/packages/${pkg_dir}"
|
||||
bundled_common_patch_dir="${CT_LIB_DIR}/packages/${pkg_name}"
|
||||
local_patch_dir="${CT_LOCAL_PATCH_DIR}/${pkg_dir}"
|
||||
|
||||
case "${patch_order}" in
|
||||
bundled) patch_dirs=("${bundled_patch_dir}");;
|
||||
bundled) patch_dirs=("${bundled_patch_dir}" "${bundled_common_patch_dir}");;
|
||||
local) patch_dirs=("${local_patch_dir}");;
|
||||
bundled,local) patch_dirs=("${bundled_patch_dir}" "${local_patch_dir}");;
|
||||
local,bundled) patch_dirs=("${local_patch_dir}" "${bundled_patch_dir}");;
|
||||
bundled,local) patch_dirs=("${bundled_patch_dir}" "${bundled_common_patch_dir}" "${local_patch_dir}");;
|
||||
local,bundled) patch_dirs=("${local_patch_dir}" "${bundled_patch_dir}" "${bundled_common_patch_dir}");;
|
||||
none) patch_dirs=;;
|
||||
esac
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user