From a04687bf7413ae60aa61712bcb16fbdc25fc73a0 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 1 Mar 2016 20:48:12 +0100 Subject: [PATCH] common: fix glibc glibc is a wonderful library. Tidy and clean. To keep it that clean it does such useful things as sorting the CFLAGS alphabeticly. Unfortunately this breaks command line arguments that contain parameters such as `-include /foo/bar`. This commit works around this flaw by removing the space and using -include/foo/bar instead. --- common/environment/configure/timestamp-macros.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/environment/configure/timestamp-macros.sh b/common/environment/configure/timestamp-macros.sh index 5daa1691dba..c3ae14521a9 100644 --- a/common/environment/configure/timestamp-macros.sh +++ b/common/environment/configure/timestamp-macros.sh @@ -1,6 +1,6 @@ if [ -n "$SOURCE_DATE_EPOCH" ]; then - CFLAGS+=" -Wno-builtin-macro-redefined -include $XBPS_STATEDIR/timestamp-macros.h" - CXXFLAGS+=" -Wno-builtin-macro-redefined -include $XBPS_STATEDIR/timestamp-macros.h" + 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 "@$SOURCE_DATE_EPOCH" +"${i#*,}")