From 7b7973654ccf5eb1f97a8bf982bb2a4e85e1d546 Mon Sep 17 00:00:00 2001 From: Phil Pennock Date: Thu, 27 Jan 2011 19:11:17 -0500 Subject: [PATCH] Use LC_ALL=C for building lookups/Makefile. --- doc/doc-txt/ChangeLog | 3 +++ src/scripts/lookups-Makefile | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 493157501..78c121007 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -23,6 +23,9 @@ PP/01 Permit LOOKUP_foo enabling on the make command-line. PP/02 Restore caching of spamd results with expanded spamd_address. Patch from author of expandable spamd_address patch, Wolfgang Breyha. +PP/03 Build issue: lookups-Makefile now exports LC_ALL=C + Improves build reliability. Fix from: Frank Elsner + Exim version 4.74 ----------------- diff --git a/src/scripts/lookups-Makefile b/src/scripts/lookups-Makefile index d5c450e4f..7f45eea03 100755 --- a/src/scripts/lookups-Makefile +++ b/src/scripts/lookups-Makefile @@ -18,8 +18,12 @@ tag_marker='MAGIC-TAG-MODS-OBJ-RULES-GO-HERE' tab=' ' -# We always do something now, since there should always be a lookup, -# and now we need to run in order to put the OBJ=$(OBJ)+ rules in. +# We rely on tr(1) for translating case below. Some people export +# values of LC_CTYPE and LC_COLLATE which apparently break our assumptions. +# We're a script expecting certain output based on known inputs and not dealing +# with UTF8, so we should be safe doingthis: +LC_ALL=C +export LC_ALL # nb: do not permit leading whitespace for this, as CFLAGS_DYNAMIC is exported # to the lookups subdir via a line with leading whitespace which otherwise @@ -31,6 +35,9 @@ then else echo >&2 "Missing CFLAGS_DYNAMIC inhibits building dynamic module lookup" enable_dynamic='' + # We always do something now, since there should always be a lookup, + # and now we need to run in order to put the OBJ=$(OBJ)+ rules in. So we + # continue on. fi tmp="$target.t" -- 2.25.1