From 85599c47431a3c6bf50a7b12b8e37c741b4c8e81 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Sun, 7 May 2017 15:51:28 -0700
Subject: Point bundled patches location to packages/

Also disable per-arch patch application: this doesn't play well with the
reuse of the sources in .build/src

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/scripts/functions b/scripts/functions
index c1b99ce..972403f 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -1251,15 +1251,14 @@ CT_Patch() {
 
     CT_DoLog EXTRA "Patching '${pkgdir}'"
 
-    bundled_patch_dir="${CT_LIB_DIR}/patches/${pkgname}/${version}"
-    bundled_patch_arch_dir="${bundled_patch_dir}/${CT_ARCH}"
+    bundled_patch_dir="${CT_LIB_DIR}/packages/${pkgname}/${version}"
     local_patch_dir="${CT_LOCAL_PATCH_DIR}/${pkgname}/${version}"
 
     case "${CT_PATCH_ORDER}" in
-        bundled)        patch_dirs=("${bundled_patch_dir}" "${bundled_patch_arch_dir}");;
+        bundled)        patch_dirs=("${bundled_patch_dir}");;
         local)          patch_dirs=("${local_patch_dir}");;
-        bundled,local)  patch_dirs=("${bundled_patch_dir}" "${bundled_patch_arch_dir}" "${local_patch_dir}");;
-        local,bundled)  patch_dirs=("${local_patch_dir}" "${bundled_patch_dir}" "${bundled_patch_arch_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
 
-- 
cgit v0.10.2-6-g49f6