diff options
| author |   Bryan Hundven <bryanhundven@gmail.com> | 2015-06-02 19:00:59 (GMT) |
|---|---|---|
| committer | Bryan Hundven <bryanhundven@gmail.com> | 2015-06-02 19:00:59 (GMT) |
| commit | c28b4f1ceb679afa7317b7b22b401aa78e3169f7 (patch) | |
| tree | 7e1e0e62bce37e96dbe4f866c723010213486687 /scripts | |
| parent | f680c002831907e570c9fe0d1a7fabdeb0bc311d (diff) | |
| parent | 67e6896c2bbd04933b826971f5de783789b21661 (diff) | |
Merge pull request #107 from bhundven/remove_experimental_musl_patches
Remove support for experimental patches and musl patches
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/functions | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/scripts/functions b/scripts/functions index 3e3440a..e62fba2 100644 --- a/scripts/functions +++ b/scripts/functions @@ -1103,17 +1103,11 @@ CT_Patch() { bundled_patch_dir="${CT_LIB_DIR}/patches/${pkgname}/${version}" local_patch_dir="${CT_LOCAL_PATCH_DIR}/${pkgname}/${version}" - # Check for experimental patches, if enabled. - if [ "${CT_EXPERIMENTAL_PATCHES}" = "y" ]; then - bundled_exp_patch_dir="${CT_LIB_DIR}/patches/experimental/${pkgname}/${version}" - local_exp_patch_dir="${CT_LOCAL_PATCH_DIR}/experimental/${pkgname}/${version}" - fi - case "${CT_PATCH_ORDER}" in - bundled) patch_dirs=("${bundled_patch_dir}" "${bundled_exp_patch_dir}");; - local) patch_dirs=("${local_patch_dir}" "${local_exp_patch_dir}");; - bundled,local) patch_dirs=("${bundled_patch_dir}" "${bundled_exp_patch_dir}" "${local_patch_dir}" "${local_exp_patch_dir}");; - local,bundled) patch_dirs=("${local_patch_dir}" "${local_exp_patch_dir}" "${bundled_patch_dir}" "${bundled_exp_patch_dir}");; + 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}");; none) patch_dirs=;; esac |