Fix #164: Allow reproducible build

Make SCCSID strings optional to allow reproducible build.
SCCSID strings are no longer included in executable files by default.
Use "./configure CFLAGS="-D USE_SCCSID" ; make" to include them.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/cifsiostat.c b/cifsiostat.c
index a3c81d00fef3860725bfb722eaef8959ce8b06e5..02c5d06a2bae39d4d154ea565145734bf508c7c6 100644 (file)
--- a/cifsiostat.c
+++ b/cifsiostat.c
@@ -41,8 +41,10 @@
 #define _(string) (string)
 #endif
 
+#ifdef USE_SCCSID
 #define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__
 char *sccsid(void) { return (SCCSID); }
+#endif
 
 unsigned long long uptime0[2] = {0, 0};
 struct cifs_stats *st_cifs[2];

diff --git a/iostat.c b/iostat.c
index 47ec602a32e3ae940499d7195575e81f8fc17aaf..458584b11f6cfef62f9b94449820ae7015fc448d 100644 (file)
--- a/iostat.c
+++ b/iostat.c
@@ -48,8 +48,10 @@
 #define _(string) (string)
 #endif
 
+#ifdef USE_SCCSID
 #define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__
 char *sccsid(void) { return (SCCSID); }
+#endif
 
 struct stats_cpu *st_cpu[2];
 unsigned long long uptime[2]  = {0, 0};

diff --git a/mpstat.c b/mpstat.c
index f8eca84041e975cdfb6dd93ed82e1e7f6d89cc72..2ab67c65a90e58866d4a318641a0cb483cc85e27 100644 (file)
--- a/mpstat.c
+++ b/mpstat.c
@@ -43,8 +43,10 @@
 #define _(string) (string)
 #endif
 
+#ifdef USE_SCCSID
 #define SCCSID "@(#)sysstat-" VERSION ": "  __FILE__ " compiled " __DATE__ " " __TIME__
 char *sccsid(void) { return (SCCSID); }
+#endif
 
 unsigned long long uptime[3] = {0, 0, 0};
 unsigned long long uptime0[3] = {0, 0, 0};

diff --git a/pidstat.c b/pidstat.c
index 820318b30560ec558c2bcf1d85e3ff1fb1d6303e..3029897e1f3dbf67c15a93354969e74760fa0b39 100644 (file)
--- a/pidstat.c
+++ b/pidstat.c
@@ -47,8 +47,10 @@
 #define _(string) (string)
 #endif
 
+#ifdef USE_SCCSID
 #define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__
 char *sccsid(void) { return (SCCSID); }
+#endif
 
 unsigned long long uptime[3] = {0, 0, 0};
 unsigned long long uptime0[3] = {0, 0, 0};

diff --git a/sadc.c b/sadc.c
index 96af66f4557188ce586d7f560190b2620f4d1d25..47765b06df8801b854ca355964aaa1b08ac0b0da 100644 (file)
--- a/sadc.c
+++ b/sadc.c
@@ -52,8 +52,10 @@
 #include "sensors/error.h"
 #endif
 
+#ifdef USE_SCCSID
 #define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__
 char *sccsid(void) { return (SCCSID); }
+#endif
 
 long interval = 0;
 unsigned int flags = 0;

diff --git a/sadf.c b/sadf.c
index b549ea8aa252184a6c62da3f14c7e431c52ad340..d33d4ee55b3d6a4cb32cfab3ebe2b284853fe069 100644 (file)
--- a/sadf.c
+++ b/sadf.c
@@ -41,8 +41,10 @@
 # define _(string) (string)
 #endif
 
+#ifdef USE_SCCSID
 #define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__
 char *sccsid(void) { return (SCCSID); }
+#endif
 
 long interval = -1, count = 0;
 

diff --git a/sar.c b/sar.c
index ee1c9fc42cc5bdf23c58ac3b516543d9ecdea1f4..f8a1e548973415373a8ce8bb71a728e30dcfe5cd 100644 (file)
--- a/sar.c
+++ b/sar.c
@@ -42,8 +42,10 @@
 #define _(string) (string)
 #endif
 
+#ifdef USE_SCCSID
 #define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__
 char *sccsid(void) { return (SCCSID); }
+#endif
 
 /* Interval and count parameters */
 long interval = -1, count = 0;

diff --git a/tapestat.c b/tapestat.c
index 268e4a5a3b5aafd7b7907d520cbc52f06a4cf261..a6efb56dcfeb581893f8b3188b09bb826285f519 100644 (file)
--- a/tapestat.c
+++ b/tapestat.c
@@ -58,8 +58,10 @@
 #define _(string) (string)
 #endif
 
+#ifdef USE_SCCSID
 #define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__
 char *sccsid(void) { return (SCCSID); }
+#endif
 
 int cpu_nr = 0;                /* Nb of processors on the machine */
 int flags = 0;         /* Flag for common options and system state */