[exim-cvs] Work on IRIX by setting _XPG=1

Gitweb: http://git.exim.org/exim.git/commitdiff/bddd752627531884c9aeb087dd71d0c69e5371b3

Commit:     bddd752627531884c9aeb087dd71d0c69e5371b3
Parent:     554e333ebbe0552b61604cdf8fec77f507a3ab9b
Author:     Phil Pennock <pdp@???>
AuthorDate: Wed Feb 23 05:26:58 2011 -0500
Committer:  Phil Pennock <pdp@???>
CommitDate: Wed Feb 23 16:53:16 2011 -0500

    Work on IRIX by setting _XPG=1
---
 doc/doc-txt/ChangeLog        |    2 ++
 src/scripts/lookups-Makefile |   28 ++++++++++++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 04b643f..b733fdd 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -76,6 +76,8 @@ NM/05 Fix to spam.c to accommodate older gcc versions which dislike
       variable declaration deep within a block.  Bug and patch from
       Dennis Davis.

+PP/15 lookups-Makefile IRIX compatibilty coercion.
+

Exim version 4.74
-----------------
diff --git a/src/scripts/lookups-Makefile b/src/scripts/lookups-Makefile
index 7f45eea..cd0a51b 100755
--- a/src/scripts/lookups-Makefile
+++ b/src/scripts/lookups-Makefile
@@ -2,13 +2,29 @@

# We turn the configure-built build-$foo/lookups/Makefile.predynamic into Makefile

-if [ -x /usr/xpg4/bin/sh ] && [ -z "$EXIM_BLOCK_XPG4_LOOP" ]
+# We always re-exec ourselves at least once, because it's the cleanest and
+# most portable way to turn on various features we expect of POSIX sh.
+if [ -z "$EXIM_LOOKUP_MAKEFILE_ADJUSTED" ]
 then
-  EXIM_BLOCK_XPG4_LOOP=yes
-  export EXIM_BLOCK_XPG4_LOOP
-  PATH="/usr/xpg4/bin:$PATH"
-  export PATH
-  exec /usr/xpg4/bin/sh "$0" "$@"
+  SHELL=/bin/sh
+  EXIM_LOOKUP_MAKEFILE_ADJUSTED=yes
+  export EXIM_LOOKUP_MAKEFILE_ADJUSTED
+
+  # Solaris sh and tr are problematic until we get xpg4 variants
+  if [ -x /usr/xpg4/bin/sh ]
+  then
+    PATH="/usr/xpg4/bin:$PATH"
+    export PATH
+    SHELL=/usr/xpg4/bin/sh
+    export SHELL
+  fi
+
+  # IRIX uses /bin/ksh for sh but in a compatibility mode unless $_XPG == 1,
+  # where said compatibility mode disables $(...)
+  _XPG=1
+  export _XPG
+
+  exec "$SHELL" "$0" "$@"
 fi

input=lookups/Makefile.predynamic