diff options
| author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-08-31 12:51:53 +0200 |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-08-31 12:51:53 +0200 |
| commit | b09e70bda5f9e5e559f6aeea95ba15035b3654a3 (patch) | |
| tree | e06c3603c767b89d2aa8276205cdbf1409cd0560 | |
| parent | dc836b5e4d3e4ab48cb3a665cd46f7efdf2af4e1 (diff) | |
| download | crosstool-ng-b09e70bda5f9e5e559f6aeea95ba15035b3654a3.tar.gz crosstool-ng-b09e70bda5f9e5e559f6aeea95ba15035b3654a3.tar.bz2 crosstool-ng-b09e70bda5f9e5e559f6aeea95ba15035b3654a3.zip | |
config: add the local,bundled patch order
This ordering first applies the local patches, then the bundeld ones.
| -rw-r--r-- | config/global/paths.in | 9 | ||||
| -rw-r--r-- | scripts/functions | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/config/global/paths.in b/config/global/paths.in index 2a35af21..bfd0cfd7 100644 --- a/config/global/paths.in +++ b/config/global/paths.in @@ -86,6 +86,14 @@ config PATCH_BUNDLED_LOCAL Apply the patches bundled with crosstool-NG, then apply your local patches. +config PATCH_LOCAL_BUNDLED + bool + prompt "Local, then bundled" + select PATCH_USE_LOCAL + help + Apply your local patches, then apply the patches + bundled with crosstool-NG. + endchoice config PATCH_ORDER @@ -93,6 +101,7 @@ config PATCH_ORDER default "bundled" if PATCH_BUNDLED default "local" if PATCH_LOCAL default "bundled,local" if PATCH_BUNDLED_LOCAL + default "local,bundled" if PATCH_LOCAL_BUNDLED config PATCH_USE_LOCAL bool diff --git a/scripts/functions b/scripts/functions index 4cfa78dd..02e2eee6 100644 --- a/scripts/functions +++ b/scripts/functions @@ -618,6 +618,7 @@ CT_Patch() { bundled) patch_dirs=("${bundled_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}");; esac for d in "${patch_dirs[@]}"; do |