Use LC_ALL=C for building lookups/Makefile.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 49315750140ad406498b2745d690e795e8c23236..78c121007552bebf0086eb453744684f886ba58f 100644 (file)
--- 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/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
 -----------------
 
 Exim version 4.74
 -----------------

diff --git a/src/scripts/lookups-Makefile b/src/scripts/lookups-Makefile
index d5c450e4fd6ea97f68866ccb84f9a8593bd4e0e7..7f45eea0323f2d6a03ea246d0cec6396b3ec7ed8 100755 (executable)
--- a/src/scripts/lookups-Makefile
+++ b/src/scripts/lookups-Makefile
@@ -18,8 +18,12 @@ tag_marker='MAGIC-TAG-MODS-OBJ-RULES-GO-HERE'
 
 tab='  '
 
 
 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
 
 # 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=''
 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"
 fi
 
 tmp="$target.t"