diff options
| author |   Chris Packham <judge.packham@gmail.com> | 2020-09-20 09:09:12 (GMT) |
|---|---|---|
| committer | Chris Packham <judge.packham@gmail.com> | 2020-09-20 09:09:12 (GMT) |
| commit | 5bc58e20274096d1ab492b3b4e97c8949944a1ba (patch) | |
| tree | 95f0a0fc94c70c32e548e8effaf167b76635e580 | |
| parent | e6e39ea63bb6f8b129e0c028493d0469ba19c9e2 (diff) | |
| parent | 4c4e5ba0470c961cc377e13f4a6f99f852098877 (diff) | |
Merge branch 'general-package-patches' of git://github.com/foss-for-synopsys-dwc-arc-processors/crosstool-ng into master
| -rw-r--r-- | scripts/functions | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/functions b/scripts/functions index 2227de7..4b3aab9 100644 --- a/scripts/functions +++ b/scripts/functions @@ -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 |