Subject: bug#25916: closed (Re: bug#25916: [PATCH] gnu: mumble: Make builds bit-reproducible.)

From: [email-masked] (GNU bug Tracking System)
Date: Tue, 04 Apr 2017 21:43:02 +0000

Your bug report

#25916: [PATCH] gnu: mumble: Make builds bit-reproducible.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
25916: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=25916
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#25916: [PATCH] gnu: mumble: Make builds bit-reproducible.
From: [email-masked] (Ludovic Courtès)
To: Marius Bakke <[email-masked]>
Cc: [email-masked], Kei Kebreau <[email-masked]>, Leo Famulari <[email-masked]>
Date: Tue, 04 Apr 2017 23:42:01 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Hello!

Marius Bakke <[email-masked]> skribis:

> Leo Famulari <[email-masked]> writes:
>
>> On Wed, Mar 01, 2017 at 12:20:41PM -0500, Kei Kebreau wrote:
>>> Marius Bakke <[email-masked]> writes:
>>> 
>>> > Kei Kebreau <[email-masked]> writes:
>>> >
>>> >> * gnu/packages/telephony.scm (mumble)[source]: Add 'substitute*' calls
>>> >> to 'snippet' for src/Version.h and src/mumble/VersionCheck.cpp.
>>> >
>>> > Thanks a lot for this! The patch LGTM, but FYI won't be necessary once
>>> > 'core-updates' is merged. See this commit, which backports a gcc7 patch.
>>> >
>>> > d71d6fe85c4db778be6a2081cbbec6a3a494e4f9
>>> >
>>> 
>>> Yay, what a useful patch!
>>> 
>>> Aren't we pretty close to merging core-updates? If that's the case, I
>>> won't worry about pushing this to master.
>>
>> Someone should try checking if they can reproduce mumble on
>> core-updates, to make sure the backported GCC 7 patch is working
>> correctly :)
>
> That's a good test. Unfortunately, mumble fails to build on
> 'core-updates'.

It builds with current master (post ‘core-updates’ merge).

I’ve done a --check build and can confirm that our GCC now honors
‘SOURCE_DATE_EPOCH’, so the patch isn’t needed.  \o/

Closing this bug!

Ludo’.

Subject: [PATCH] gnu: mumble: Make builds bit-reproducible.
From: Kei Kebreau <[email-masked]>
To: [email-masked]
Cc: Kei Kebreau <[email-masked]>
Date: Wed, 1 Mar 2017 11:35:30 -0500
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/telephony.scm (mumble)[source]: Add 'substitute*' calls
to 'snippet' for src/Version.h and src/mumble/VersionCheck.cpp.
---
 gnu/packages/telephony.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 87261825c..4ff2acd25 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -330,6 +330,12 @@ address of one of the participants.")
               (modules '((guix build utils)))
               (snippet
                `(begin
+                  ;; Remove timestamps for reproducibility.
+                  (substitute* "src/Version.h"
+                    (("\"Compiled \" __DATE__ \" \" __TIME__") "\"\""))
+                  (substitute* "src/mumble/VersionCheck.cpp"
+                    (("^.*__DATE__.*$") "")
+                    (("^.*__TIME__.*$") ""))
                   ;; Remove bundled software.
                   (for-each delete-file-recursively '("3rdparty"
                                                       "speex"
-- 
2.12.0