From aabbf322902596321e8d9e80288303049505c631 Mon Sep 17 00:00:00 2001
From: Joshua Watt <Joshua.Watt@garmin.com>
Date: Wed, 20 Feb 2019 12:44:58 -0600
Subject: [PATCH] icecream: Apply recompile patch

Applies a patch to icecream to pre-process locally if -fdirectives-only
fails, which can frequently happen if __COUNTER__ is used.
---
 patches/icecream-recompile.patch | 49 ++++++++++++++++++++++++++++++++
 scripts/build_icecream.sh        |  1 +
 2 files changed, 50 insertions(+)
 create mode 100644 patches/icecream-recompile.patch

diff --git a/patches/icecream-recompile.patch b/patches/icecream-recompile.patch
new file mode 100644
index 0000000..4151587
--- /dev/null
+++ b/patches/icecream-recompile.patch
@@ -0,0 +1,49 @@
+From cd082c64adcd3c2a22dc0565f6e5b249a975694a Mon Sep 17 00:00:00 2001
+From: Lucas Stach <l.stach@pengutronix.de>
+Date: Thu, 10 Jan 2019 11:46:05 +0100
+Subject: [PATCH] try local recompile when local cpp invocation fails
+
+When fdirectives-only is used the local cpp can fail on some macro constructs
+that are incompatible with this mode of preprocessing. Currently this fails
+the build, as it's not a remote error, which would get recovered by a local
+rebuild, but the local side failing.
+
+Instead of failing the build, trigger a local rebuild. The failure rate is
+so small that any more sophisticated recovery seems to be wasted effort. This
+leads to an additional local recompile in case of broken code, that fails in
+the cpp, but I don't think that matters, as performance of failing builds is
+probably not as important.
+---
+ client/local.cpp  | 5 +++++
+ client/remote.cpp | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/client/local.cpp b/client/local.cpp
+index 4fc6ecea..f37363a6 100644
+--- a/client/local.cpp
++++ b/client/local.cpp
+@@ -268,6 +268,11 @@ int build_local(CompileJob &job, MsgChannel *local_daemon, struct rusage *used)
+     string argstxt;
+ 
+     for (list<string>::const_iterator it = arguments.begin(); it != arguments.end(); ++it) {
++        // Filter out fdirectives-only, as this may be present when we fall back from a
++        // remote to a local compile, but this flag might be the reason we need to fall back.
++        if (it->compare("-fdirectives-only") == 0)
++            continue;
++
+         argv.push_back(strdup(it->c_str()));
+         argstxt += ' ';
+         argstxt += *it;
+diff --git a/client/remote.cpp b/client/remote.cpp
+index 5f224ba6..8b8af3e2 100644
+--- a/client/remote.cpp
++++ b/client/remote.cpp
+@@ -531,7 +531,7 @@ static int build_remote_int(CompileJob &job, UseCSMsg *usecs, MsgChannel *local_
+                 delete cserver;
+                 cserver = 0;
+                 log_warning() << "call_cpp process failed with exit status " << shell_exit_status(status) << endl;
+-                return shell_exit_status(status);
++                throw remote_error(103, "Error 103 - local cpp invocation failed, trying to recompile locally");
+             }
+         } else {
+             int cpp_fd = open(preproc_file, O_RDONLY);
diff --git a/scripts/build_icecream.sh b/scripts/build_icecream.sh
index 120860b..cfe39eb 100755
--- a/scripts/build_icecream.sh
+++ b/scripts/build_icecream.sh
@@ -23,6 +23,7 @@ ICECREAM_SHA1=e39103ff5fb6aa7e939b486df25d621696ba1d6f
 wget -O icecream.tar.gz https://github.com/icecc/icecream/archive/${ICECREAM_SHA1}.tar.gz
 tar -xvzf icecream.tar.gz
 cd icecream-$ICECREAM_SHA1
+patch -p1 < /pyrex/patches/icecream-recompile.patch
 mkdir build
 cd build
 ../autogen.sh