CT_PATCH_ORDER not defined

[Heiko Zuerker]

Hey,

Quoting "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>:
> On Saturday 18 December 2010 22:31:28 Heiko Zuerker wrote:
>> I'm using crosstool-ng 1.9.1. configure does not define
>> CT_PATCH_ORDER, which CT_Patch is looking for.
>
> Oh, this has been a long-standing bug... You're the first to notice it... :-/
>
>> I looked over the code and also couldn't find how or where the
>> CT_PATCH_LOCAL_FALLBACK_BUNDLED is handled (I could simply be blind
>> too).
>
> Does the attached fixes it for you?

This one unfortunately does not work, since it would always try to  
apply both patches.

I attached a patch which works.
The patch could be made much smaller, but I decided to rather make  
sure others can read it.

-- 

Regards
   Heiko Zuerker
   http://www.devil-linux.org


----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.

-------------- next part --------------
diff -ru crosstool-ng-1.9.1.orig/scripts/functions crosstool-ng-1.9.1/scripts/functions
--- crosstool-ng-1.9.1.orig/scripts/functions	2010-12-19 09:58:49.000000000 -0600
+++ crosstool-ng-1.9.1/scripts/functions	2010-12-19 09:50:05.000000000 -0600
@@ -803,7 +803,23 @@
         local,bundled)  patch_dirs=("${local_patch_dir}" "${bundled_patch_dir}");;
         none)           patch_dirs=;;
     esac
-
+	
+	if [ "${CT_PATCH_LOCAL_FALLBACK_BUNDLED}" = "y" ]; then
+		if [ -e "${local_patch_dir}" ]; then
+			patch_dirs=("${local_patch_dir}")
+		else
+			patch_dirs=("${bundled_patch_dir}")
+		fi
+	fi
+	
+	if [ "${CT_PATCH_BUNDLED_FALLBACK_LOCAL}" = "y" ]; then
+		if [ -e "${bundled_patch_dir}" ]; then
+			patch_dirs=("${bundled_patch_dir}")
+		else
+			patch_dirs=("${local_patch_dir}")
+		fi
+	fi
+	
     for d in "${patch_dirs[@]}"; do
         CT_DoLog DEBUG "Looking for patches in '${d}'..."
         if [ -n "${d}" -a -d "${d}" ]; then

-------------- next part --------------
--
For unsubscribe information see http://sourceware.org/lists.html#faq