From ec405b36ebb1ab609f7e036cfbcb192703da6881 Mon Sep 17 00:00:00 2001
From: Per Hedbor <ph@opera.com>
Date: Sat, 4 May 2013 00:21:24 +0200
Subject: [PATCH] Do not cache the precompilation method.

Doing so makes it impossible to compile pike unless the first detected
method can handle everything in post_modules (basically, you need a
modern 7.9 to compile pike 7.9)
---
 src/precompile.sh.in | 76 ++++++++++++++++++++++----------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/precompile.sh.in b/src/precompile.sh.in
index 6d59cb2dbe..26cec774ba 100644
--- a/src/precompile.sh.in
+++ b/src/precompile.sh.in
@@ -2,10 +2,10 @@
 
 #set -x
 if [ x"$1" = x--cache ]; then
-  CACHE_OUTPUT=yes
+#  CACHE_OUTPUT=yes
   shift 1
-else
-  CACHE_OUTPUT=no
+#else
+#  CACHE_OUTPUT=no
 fi
 
 exec 5>&1 1>&2
@@ -39,13 +39,13 @@ if test "@CROSS@" = "yes"; then
   retries="....."
 else :; fi
 
-test -d "$PREDIR" || mkdir "$PREDIR"
+#test -d "$PREDIR" || mkdir "$PREDIR"
 
-if test -f "$PREDIR/method" ; then
-  . "$PREDIR/method"
-else
-  :
-fi
+#if test -f "$PREDIR/method" ; then
+#  . "$PREDIR/method"
+#else
+#  :
+#fi
 
 old_method="${method-}"
 
@@ -73,24 +73,24 @@ case "$SCRIPT" in
   ;;
 esac
 
-if [ $CACHE_OUTPUT = yes ]; then
-  for arg
-  do
-    INPUT="$arg"
-  done
-  TMPOUTPUT="${INPUT}.compiled"
-
-  if [ -f "$TMPOUTPUT" ]; then
-    if [ "`ls -1Lt $TMPOUTPUT $INPUT $SCRIPT 2>/dev/null | head -n 1`" = "`ls -1Lt $TMPOUTPUT`" ]; then
-      cat "$TMPOUTPUT" >&5
-      exit 0
-    fi
-  fi
-else
-  TMPOUTPUT=x
-fi
+#if [ $CACHE_OUTPUT = yes ]; then
+#  for arg
+#  do
+#    INPUT="$arg"
+#  done
+#  TMPOUTPUT="${INPUT}.compiled"
+
+#  if [ -f "$TMPOUTPUT" ]; then
+#    if [ "`ls -1Lt $TMPOUTPUT $INPUT $SCRIPT 2>/dev/null | head -n 1`" = "`ls -1Lt $TMPOUTPUT`" ]; then
+#      cat "$TMPOUTPUT" >&5
+#      exit 0
+#    fi
+#  fi
+#else
+#  TMPOUTPUT=x
+#fi
 
-test $CACHE_OUTPUT = yes && trap 'rm -rf "$TMPOUTPUT" ; exit 1' 1 2 15
+#test $CACHE_OUTPUT = yes && trap 'rm -rf "$TMPOUTPUT" ; exit 1' 1 2 15
 
 # method QQQQQQQ below requires a path without repeats.
 UNIQPATH=""
@@ -175,25 +175,25 @@ esac
 if test "x${RUNPIKE-}" != x ; then
   echo "precompile: $RUNPIKE $SCRIPT $@ (method=$method)"
 
-  if [ $CACHE_OUTPUT = yes ]; then
-    $RUNPIKE $SCRIPT "$@" >"$TMPOUTPUT"
-  else
+#  if [ $CACHE_OUTPUT = yes ]; then
+#    $RUNPIKE $SCRIPT "$@" >"$TMPOUTPUT"
+#  else
     $RUNPIKE $SCRIPT "$@" >&5
-  fi
+#  fi
 
   if [ $? = 0 ]; then
 
-    cat > "$PREDIR/method.$$" <<EOF && \
-      mv "$PREDIR/method.$$" "$PREDIR/method"
-LAST_PIKE="$LAST_PIKE"
-method="$method"
-#retries="$retries"
-EOF
+#    cat > "$PREDIR/method.$$" <<EOF && \
+#      mv "$PREDIR/method.$$" "$PREDIR/method"
+#LAST_PIKE="$LAST_PIKE"
+#method="$method"
+##retries="$retries"
+#EOF
 
-    test $CACHE_OUTPUT = yes && cat "$TMPOUTPUT" >&5
+#    test $CACHE_OUTPUT = yes && cat "$TMPOUTPUT" >&5
     exit 0
   else
-    test $CACHE_OUTPUT = yes && rm "$TMPOUTPUT"
+#    test $CACHE_OUTPUT = yes && rm "$TMPOUTPUT"
   fi
 fi
 
-- 
GitLab