From 69cb0beb58322f33803060c3c123c55f61fb99a6 Mon Sep 17 00:00:00 2001
From: Enno Boland <g@s01.de>
Date: Tue, 1 Mar 2016 18:08:52 +0100
Subject: [PATCH] environment/configure: move macro definition to a header file
 and include it.

This prevents escaping issues with command line options.
---
 common/environment/configure/timestamp-macros.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/common/environment/configure/timestamp-macros.sh b/common/environment/configure/timestamp-macros.sh
index 25f8aa4586..c913302934 100644
--- a/common/environment/configure/timestamp-macros.sh
+++ b/common/environment/configure/timestamp-macros.sh
@@ -1,8 +1,12 @@
 if [ -n "$XBPS_COMMIT_TIMESTAMP" ]; then
-	CFLAGS+=" -Wno-builtin-macro-redefined"
-	CXXFLAGS+=" -Wno-builtin-macro-redefined"
-	for i in "DATE,%b\x20%d\x20%Y" "TIME,%H:%M:%S" "DATETIME,%b\x20%d\x20%Y\x20%H:%M:%S"; do
-		CFLAGS+=" -U__${i%%,*}__ -D__${i%%,*}__=\\\"$(LC_ALL=C date --date "$XBPS_COMMIT_TIMESTAMP" +"${i#*,}")\\\""
-		CXXFLAGS+=" -U__${i%%,*}__ -D__${i%%,*}__=\\\"$(LC_ALL=C date --date "$XBPS_COMMIT_TIMESTAMP" +"${i#*,}")\\\""
+	CFLAGS+=" -Wno-builtin-macro-redefined -include $XBPS_STATEDIR/timestamp-macros.h"
+	CXXFLAGS+=" -Wno-builtin-macro-redefined -include $XBPS_STATEDIR/timestamp-macros.h"
+	for i in "DATE,%b %d %Y" "TIME,%H:%M:%S" "DATETIME,%b %d %Y %H:%M:%S"; do
+		mcr=${i%%,*}
+		val=$(LC_ALL=C date --date "$XBPS_COMMIT_TIMESTAMP" +"${i#*,}")
+		cat >> $XBPS_STATEDIR/timestamp-macros.h <<EOF
+#undef __${mcr}__
+#define __${mcr}__ "${val}"
+EOF
 	done
 fi