1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
From b6860ea26851edb599bfe0e2d08d212c6a7aaeec Mon Sep 17 00:00:00 2001
From: Val Lorentz <progval@progval.net>
Date: Sun, 29 Jan 2017 17:39:54 -0800
Subject: [PATCH] Remove date from version info to make build reproducible
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
asm/nasm.c | 4 ++--
disasm/ndisasm.c | 4 ++--
include/ver.h | 1 -
nasmlib/ver.c | 1 -
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/asm/nasm.c b/asm/nasm.c
index e5ae89af..70024db5 100644
--- a/asm/nasm.c
+++ b/asm/nasm.c
@@ -977,8 +977,8 @@ static const struct textargs textopts[] = {
static void show_version(void)
{
- printf("NASM version %s compiled on %s%s\n",
- nasm_version, nasm_date, nasm_compile_options);
+ printf("NASM version %s%s\n",
+ nasm_version, nasm_compile_options);
exit(0);
}
diff --git a/disasm/ndisasm.c b/disasm/ndisasm.c
index 01e0c557..7424b282 100644
--- a/disasm/ndisasm.c
+++ b/disasm/ndisasm.c
@@ -120,8 +120,8 @@ int main(int argc, char **argv)
case 'r':
case 'v':
fprintf(stderr,
- "NDISASM version %s compiled on %s\n",
- nasm_version, nasm_date);
+ "NDISASM version %s\n",
+ nasm_version);
return 0;
case 'u': /* -u for -b 32, -uu for -b 64 */
if (bits < 64)
diff --git a/include/ver.h b/include/ver.h
index a5bbf384..7a6ce42a 100644
--- a/include/ver.h
+++ b/include/ver.h
@@ -41,7 +41,6 @@
#include "compiler.h"
extern const char nasm_version[];
-extern const char nasm_date[];
extern const char nasm_compile_options[];
extern bool reproducible;
diff --git a/nasmlib/ver.c b/nasmlib/ver.c
index 96260b6c..8f02eaca 100644
--- a/nasmlib/ver.c
+++ b/nasmlib/ver.c
@@ -36,7 +36,6 @@
/* This is printed when entering nasm -v */
const char nasm_version[] = NASM_VER;
-const char nasm_date[] = __DATE__;
const char nasm_compile_options[] = ""
#ifdef DEBUG
" with -DDEBUG"
--
2.28.0
|
