From acd5aced161a476e52e65a2f143650be29860814 Mon Sep 17 00:00:00 2001
From: Rich Burridge <rich.burridge@oracle.com>
Date: Mon, 01 Oct 2012 22:35:11 +0200
Subject: [PATCH] 7196595 Timestamp problem causes various clisp files to be delivered twice
---
tools/time.c | 8 +++++---
components/clisp/Makefile | 14 ++++++++++++++
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/components/clisp/Makefile b/components/clisp/Makefile
index f2e9b2a..72d46db 100644
--- a/components/clisp/Makefile
+++ b/components/clisp/Makefile
@@ -64,6 +64,20 @@
CONFIGURE_OPTIONS += --with-libsigsegv-prefix=$(CONFIGURE_PREFIX)
CONFIGURE_OPTIONS += --with-libreadline-prefix=$(CONFIGURE_PREFIX)
+# Prevent clisp.ps and clisp.pdf having different versions for SPARC
+# and x86 in the clisp package, because of embedded dates.
+TIME_CONSTANT = 1348000000
+COMPONENT_BUILD_ENV += $(CONSTANT_TIME)
+
+# Adjust the "/ID [ ... ]" line in clisp.pdf to set it to a fixed value
+# to prevent it having different versions for SPARC and x86 in the clisp
+# package. This value is normally generated by ghostscript, and is
+# different on each machine. The fixed value that's been used comes from
+# value generated when building clisp on the Userland SPARC build machine.
+COMPONENT_POST_INSTALL_ACTION = \
+ (cd $(PROTOUSRSHAREDOCDIR)/clisp/doc ; \
+ $(GSED) -i 's|^/ID.*|/ID [<DEA6B2ECA0DB714B6BEB6209A211AEF0><DEA6B2ECA0DB714B6BEB6209A211AEF0>]|' clisp.pdf)
+
# One of the tests now needs the GNU tail command.
COMPONENT_TEST_ENV += PATH="$(GNUBIN):$(PATH)"
diff --git a/tools/time.c b/tools/time.c
index 87b198b..cdc4147 100644
--- a/tools/time.c
+++ b/tools/time.c
@@ -36,9 +36,11 @@
#include <time.h>
/* The list of programs that we want to use a constant time. */
-static char *programs[] = { "autogen", "bash", "cpp", "cc1", "date", "doxygen",
- "erl", "javadoc", "ksh", "ksh93", "ld", "perl", "perl5.8.4", "perl5.10",
- "ruby", "sh", NULL };
+static char *programs[] = {
+ "autogen", "bash", "cpp", "cc1", "date", "doxygen",
+ "erl", "grops", "gs", "gtroff", "javadoc", "ksh", "ksh93", "ld",
+ "perl", "perl5.8.4", "perl5.10", "ruby", "sh", NULL
+};
static int
stack_info(uintptr_t pc, int signo, void *arg)
--
Gitblit v1.9.3