[PATCH] RFC s3: drop build_env

[Bernhard M. Wiedemann]

for enabling reproducible builds, without the added complexity of
https://lists.samba.org/archive/samba-technical/2017-June/121302.html

I left most of wscript alone for now, since I do not understand it

Signed-off-by: Bernhard M. Wiedemann <bwiedemann at suse.de>
---
 buildtools/wafsamba/samba_patterns.py | 14 -------------
 source3/script/build_env.sh           | 38 +----------------------------------
 source3/wscript_build                 |  6 +-----
 3 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/buildtools/wafsamba/samba_patterns.py b/buildtools/wafsamba/samba_patterns.py
index 1baa6019065..e809f26a095 100644
--- a/buildtools/wafsamba/samba_patterns.py
+++ b/buildtools/wafsamba/samba_patterns.py
@@ -51,7 +51,6 @@ def write_build_options_header(fp):
     fp.write("*/\n")
     fp.write("\n")
     fp.write("#include \"includes.h\"\n")
-    fp.write("#include \"build_env.h\"\n")
     fp.write("#include \"dynconfig/dynconfig.h\"\n")
     fp.write("#include \"lib/cluster_support.h\"\n")
 
@@ -92,19 +91,6 @@ def write_build_options_header(fp):
     fp.write("              return;\n")
     fp.write("       }\n")
     fp.write("\n")
-    fp.write("#ifdef _BUILD_ENV_H\n")
-    fp.write("       /* Output information about the build environment */\n")
-    fp.write("       output(screen,\"Build environment:\\n\");\n")
-    fp.write("       output(screen,\"   Built by:    %s@%s\\n\",BUILD_ENV_USER,BUILD_ENV_HOST);\n")
-    fp.write("       output(screen,\"   Built on:    %s\\n\",BUILD_ENV_DATE);\n")
-    fp.write("\n")
-    fp.write("       output(screen,\"   Built using: %s\\n\",BUILD_ENV_COMPILER);\n")
-    fp.write("       output(screen,\"   Build host:  %s\\n\",BUILD_ENV_UNAME);\n")
-    fp.write("       output(screen,\"   SRCDIR:      %s\\n\",BUILD_ENV_SRCDIR);\n")
-    fp.write("       output(screen,\"   BUILDDIR:    %s\\n\",BUILD_ENV_BUILDDIR);\n")
-    fp.write("\n")
-    fp.write("\n")
-    fp.write("#endif\n")
     fp.write("\n")
     fp.write("       /* Output various paths to files and directories */\n")
     fp.write("       output(screen,\"\\nPaths:\\n\");\n")
diff --git a/source3/script/build_env.sh b/source3/script/build_env.sh
index eb54f37aeda..64dec376f10 100755
--- a/source3/script/build_env.sh
+++ b/source3/script/build_env.sh
@@ -1,41 +1,5 @@
 #!/bin/sh
-
-if [ $# -lt 3 ]
-then
-    echo "Usage: $0 srcdir builddir compiler"
-    exit 1
-fi
-
-uname=`uname -a`
-date=`date`
-srcdir=$1
-builddir=$2
-compiler=$3
-
-if [ ! "x$USER" = "x" ]; then
-    whoami=$USER
-else 
-    if [ ! "x$LOGNAME" = "x" ]; then
-	whoami=$LOGNAME
-    else
-	whoami=`whoami || id -un`
-    fi
-fi
-
-host=`hostname`
-
 cat <<EOF
 /* This file is automatically generated with "make include/build_env.h". DO NOT EDIT */
-
-#ifndef _BUILD_ENV_H
-#define _BUILD_ENV_H
-
-#define BUILD_ENV_UNAME "${uname}"
-#define BUILD_ENV_DATE "${date}"
-#define BUILD_ENV_SRCDIR "${srcdir}"
-#define BUILD_ENV_BUILDDIR "${builddir}"
-#define BUILD_ENV_USER "${whoami}"
-#define BUILD_ENV_HOST "${host}"
-#define BUILD_ENV_COMPILER "${compiler}"
-#endif /* _BUILD_ENV_H */
+/* leftover stub - not used anymore */
 EOF
diff --git a/source3/wscript_build b/source3/wscript_build
index 2cc74e0f4ec..c709246e215 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -12,11 +12,7 @@ bld.SAMBA_BLDOPTIONS('smbd/build_options.c')
 t = bld.SAMBA_GENERATOR('build_env.h',
                         source='script/build_env.sh',
                         target='include/build_env.h',
-                        rule='${SRC} ${SRCDIR} ${BUILDDIR} ${CC} > ${TGT}')
-# todo: work out what is really wanted here
-t.env.SRCDIR = bld.path.abspath()
-t.env.BUILDDIR = bld.path.abspath()
-
+                        rule='${SRC} > ${TGT}')
 bld.SETUP_BUILD_GROUPS()
 
 ######################## SUBSYSTEMS #################################
-- 
2.12.3