From 760c739e8fdf68efcaad8d27b28104c141502505 Mon Sep 17 00:00:00 2001 From: giraffedata Date: Mon, 10 Jul 2023 21:46:22 +0000 Subject: Add COMPILED_BY environment variable git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4566 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- buildtools/stamp-date | 16 ++++++++++++---- doc/HISTORY | 4 ++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/buildtools/stamp-date b/buildtools/stamp-date index f867416d..baeec3fd 100755 --- a/buildtools/stamp-date +++ b/buildtools/stamp-date @@ -12,6 +12,11 @@ # SOURCE_DATE_EPOCH is an environment variable as described here: # https://reproducible-builds.org/specs/source-date-epoch/ on 2017.03.16. +# COMPILED_BY is a similar environment variable whose value is some +# description of who is doing the build. If it is not set, we use the +# value of LOGNAME; if that is not set, we use the value of User; if that +# is not set, we use the output of program 'whoami'. + SOURCE_DATE_OR_NONE=${SOURCE_DATE_EPOCH:-NONE} NOW_FROM_DATE_PGM=$(date +%s) @@ -24,9 +29,12 @@ else fi LOGNAME_OR_UNKNOWN=${LOGNAME:-UNKNOWN} -USER=${USER:-$LOGNAME_OR_UNKNOWN} -if [ "$USER" = "UNKNOWN" ]; then - USER=$(whoami) +USER_OR_UNKNOWN=${USER:-$LOGNAME_OR_UNKNOWN} +COMPILED_BY_OR_UNKNOWN=${COMPILED_BY:-$USER_OR_UNKNOWN} +if [ "$COMPILED_BY_OR_UNKNOWN" = "UNKNOWN" ]; then + COMPILED_BY=$(whoami) +else + COMPILED_BY=$COMPILED_BY_OR_UNKNOWN fi echo "/* This file tells some facts about the building of the package */" @@ -36,4 +44,4 @@ if [ "$SOURCE_DATE_OR_NONE" != "NONE" ]; then echo "#define SOURCE_DATETIME $SOURCE_DATE_OR_NONE" fi echo "#define BUILD_DATETIME $BUILD_DATETIME" -echo "#define COMPILED_BY \"$USER\"" +echo "#define COMPILED_BY \"$COMPILED_BY\"" diff --git a/doc/HISTORY b/doc/HISTORY index 88f59c56..35aeb6fe 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -8,6 +8,10 @@ not yet BJH Release 11.04.00 g3topbm: Add -correctlong + build: add COMPILED_BY environment variable to control the + "compiled by" value from --version common option. This helps + with creating reproducible builds. + 23.06.28 BJH Release 11.03.00 pamstack: Add -firstmaxval, -lcmmaxval -- cgit 1.4.1