GNU bug report logs - #25934
[PATCH] gnu: icedtea-8: Do not embed build time.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 25934 in the body.
You can then email your comments to 25934 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <rekado <at> elephly.net>
To: guix-patches <at> gnu.org
Cc: Ricardo Wurmus <rekado <at> elephly.net>
Subject: [PATCH] gnu: icedtea-8: Do not embed build time.
Date: Thu,  2 Mar 2017 12:39:09 +0100

* gnu/packages/java.scm (icedtea-8)[source]: Modify snippet to erase the
embedded build time.
---
 gnu/packages/java.scm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index cf4ba69d6..1ff106cb9 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado <at> elephly.net>
+;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado <at> elephly.net>
 ;;; Copyright © 2016 Leo Famulari <leo <at> famulari.name>
 ;;; Copyright © 2016, 2017 Roel Janssen <roel <at> gnu.org>
 ;;; Copyright © 2017 Carlo Zancanaro <carlo <at> zancanaro.id.au>
@@ -855,10 +855,15 @@ IcedTea build harness.")
                   "02vmxa6gc6gizcri1fy797qmmm9y77vgi7gy9pwkk4agcw4zyr5p"))
                 (modules '((guix build utils)))
                 (snippet
-                 '(substitute* "Makefile.am"
-                    ;; do not leak information about the build host
-                    (("DISTRIBUTION_ID=\"\\$\\(DIST_ID\\)\"")
-                     "DISTRIBUTION_ID=\"\\\"guix\\\"\"")))))
+                 '(begin
+                    (substitute* "acinclude.m4"
+                      ;; Do not embed build time
+                      (("(DIST_ID=\"Custom build).*$" _ prefix)
+                       (string-append prefix "\"\n"))
+                      ;; Do not leak information about the build host
+                      (("DIST_NAME=\"\\$build_os\"")
+                       "DIST_NAME=\"guix\""))
+                    #t))))
       (arguments
        (substitute-keyword-arguments (package-arguments icedtea-7)
          ((#:configure-flags flags)
-- 
2.12.0

Message #10 received at 25934-done <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <rekado <at> elephly.net>
To: 25934-done <at> debbugs.gnu.org
Subject: Re: bug#25934: [PATCH] gnu: icedtea-8: Do not embed build time.
Date: Thu, 02 Mar 2017 21:51:05 +0100

> * gnu/packages/java.scm (icedtea-8)[source]: Modify snippet to erase the
> embedded build time.

Since I’ve just pushed the patch to remove icedtea-6, which causes a
rebuild of icedtea-8 I went ahead and also pushed this one to master
with commit 0c729ef4e.

~~ Ricardo

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.