nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: openjdk: Make idlj respect SOURCE_DATE_EPOCH. 

* gnu/packages/patches/openjdk-10-idlj-reproducibility.patch: New file.
* gnu/packages/java.scm (openjdk10)[source]: Use it.
* gnu/locale.mk (dist_patch_DATA): Register it.
This commit is contained in:
Gábor Boskovits 2018-12-09 12:41:15 +01:00
parent 99c39c28f9
commit accb5c3100
No known key found for this signature in database
GPG Key ID: 2506A96CCF630B21
3 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/local.mk
View File

@ -1019,6 +1019,7 @@ dist_patch_DATA = \
%D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch \
%D%/packages/patches/opencascade-oce-glibc-2.26.patch \
%D%/packages/patches/openfoam-4.1-cleanup.patch \
%D%/packages/patches/openjdk-10-idlj-reproducibility.patch \
%D%/packages/patches/openldap-CVE-2017-9287.patch \
%D%/packages/patches/openocd-nrf52.patch \
%D%/packages/patches/opensmtpd-fix-crash.patch \

2
gnu/packages/java.scm
View File

@ -1820,6 +1820,8 @@ new Date();"))
(sha256
(base32
"0zywq2203b4hx4jms9vbwvjcj1d3k2v3qpx4s33729fkpmid97r4"))
(patches (search-patches
"openjdk-10-idlj-reproducibility.patch"))
(modules '((guix build utils)))
(snippet
`(begin

36
gnu/packages/patches/openjdk-10-idlj-reproducibility.patch Normal file
View File

@ -0,0 +1,36 @@
From a0a0c6a43b88d946f2b5484892cf0209bd7c0e68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= <boskovits@gmail.com>
Date: Sat, 8 Dec 2018 21:25:31 +0100
Subject: [PATCH] Make idlj respect SOURCE_DATE_EPOCH.
---
.../sun/tools/corba/se/idl/toJavaPortable/Util.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java
index 7397619f2..583d6b8e4 100644
--- a/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java
+++ b/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java
@@ -1146,7 +1146,18 @@ public class Util extends com.sun.tools.corba.se.idl.Util
else
formatter.setTimeZone (java.util.TimeZone.getDefault ());
- stream.println ("* " + formatter.format (new Date ()));
+ try {
+ String epoch = System.getenv("SOURCE_DATE_EPOCH");
+ if(epoch != null) {
+ long unixTime = Long.parseLong(epoch);
+ stream.println ("* " + formatter.format (new Date (unixTime*1000L)));
+ } else {
+ stream.println ("* " + formatter.format (new Date ()));
+ }
+ } catch (Exception e) {
+ //in case of error fall back to default
+ stream.println ("* " + formatter.format (new Date ()));
+ }
// <daz>
///////////////
--
2.19.2