From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 28 May 2010 08:26:25 +0000 (+0100)
Subject: stubdom/newlib: Provide correct names for time.h timezone variables
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12064
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=821be8a24364ed2906b5e4c44993cb21a0832f30;p=xen.git

stubdom/newlib: Provide correct names for time.h timezone variables

Newlib unaccountably defines _daylight, _timezone and _tzname, rather
than daylight, timezone and tzname.  The latter are specified in
SuSv3.

So do a global search and replace as part of our newlib patching :-(.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---

diff --git a/stubdom/Makefile b/stubdom/Makefile
index 43e8e9217b..cd18b9972d 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -102,6 +102,8 @@ newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz
 	patch -d $@ -p0 < newlib.patch
 	patch -d $@ -p0 < newlib-chk.patch
 	patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch
+	find $@ -type f | xargs perl -i.bak \
+		-pe 's/\b_(tzname|daylight|timezone)\b/$$1/g'
 	touch $@
 
 NEWLIB_STAMPFILE=$(CROSS_ROOT)/$(GNU_TARGET_ARCH)-xen-elf/lib/libc.a