[tz] [PROPOSED PATCH 1/3] Port 'make check_time_t_alternatives' to Solaris 10.
Paul Eggert
eggert at cs.ucla.edu
Tue Aug 26 00:16:47 UTC 2014
* Makefile (check_time_t_alternatives): Don't assume 'diff'
has the -q option, since POSIX does not require -q.
* NEWS: Document this.
---
Makefile | 9 ++++++++-
NEWS | 2 ++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 0fc8e2c..92fad4d 100644
--- a/Makefile
+++ b/Makefile
@@ -569,6 +569,11 @@ check_public: $(ENCHILADA)
# Check that the code works under various alternative
# implementations of time_t.
check_time_t_alternatives:
+ if diff -q Makefile Makefile 2>/dev/null; then \
+ quiet_option='-q'; \
+ else \
+ quiet_option=''; \
+ fi && \
zones=`$(AWK) '/^[^#]/ { print $$3 }' <zone1970.tab` && \
for type in $(TIME_T_ALTERNATIVES); do \
mkdir -p tzpublic/$$type && \
@@ -577,7 +582,9 @@ check_time_t_alternatives:
CFLAGS='$(CFLAGS) -Dtime_tz='"'$$type'" \
REDO='$(REDO)' \
install && \
- diff -qr tzpublic/int64_t/etc/zoneinfo tzpublic/$$type/etc/zoneinfo && \
+ diff $$quiet_option -r \
+ tzpublic/int64_t/etc/zoneinfo \
+ tzpublic/$$type/etc/zoneinfo && \
case $$type in \
int32_t) range=-2147483648,2147483647;; \
uint32_t) range=0,4294967296;; \
diff --git a/NEWS b/NEWS
index fb2f31b..a453ef6 100644
--- a/NEWS
+++ b/NEWS
@@ -112,6 +112,8 @@ Unreleased, experimental changes
'zdump' no longer links in ialloc.o, as it's not needed.
+ 'make check_time_t_alternatives' no longer assumes GNU diff.
+
Changes affecting distribution tarballs
The files checktab.awk and zoneinfo2tdf.pl are now distributed in
--
1.9.1
More information about the tz
mailing list