diff --git a/autogen.pl b/autogen.pl index eec456c8538..c1546f97c03 100755 --- a/autogen.pl +++ b/autogen.pl @@ -5,7 +5,7 @@ # Copyright (c) 2013 Mellanox Technologies, Inc. # All rights reserved. # Copyright (c) 2013-2014 Intel, Inc. All rights reserved. -# Copyright (c) 2015-2016 Research Organization for Information Science +# Copyright (c) 2015-2017 Research Organization for Information Science # and Technology (RIST). All rights reserved. # Copyright (c) 2015 IBM Corporation. All rights reserved. # @@ -1178,7 +1178,7 @@ sub in_tarball { dnl This file is automatically created by autogen.pl; it should not dnl be edited by hand!! dnl -dnl Generated by $username at " . localtime(time) . " +dnl Generated by $username at " . localtime($ENV{SOURCE_DATE_EPOCH} || time) . " dnl on $full_hostname. $dnl_line\n\n"; diff --git a/config/getdate.sh b/config/getdate.sh new file mode 100755 index 00000000000..e3ca9b058e8 --- /dev/null +++ b/config/getdate.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +# Copyright (c) 2017 Research Organization for Information Science +# and Technology (RIST). All rights reserved. + +date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" diff --git a/config/opal_functions.m4 b/config/opal_functions.m4 index b1e4d4e140a..ed05054c840 100644 --- a/config/opal_functions.m4 +++ b/config/opal_functions.m4 @@ -96,7 +96,7 @@ EOF OPAL_CONFIGURE_USER="`whoami`" OPAL_CONFIGURE_HOST="`(hostname || uname -n) 2> /dev/null | sed 1q`" -OPAL_CONFIGURE_DATE="`date`" +OPAL_CONFIGURE_DATE="`date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}"`" OPAL_LIBNL_SANITY_INIT @@ -118,7 +118,7 @@ AC_DEFUN([OPAL_BASIC_SETUP],[ OPAL_CONFIGURE_USER="`whoami`" OPAL_CONFIGURE_HOST="`(hostname || uname -n) 2> /dev/null | sed 1q`" -OPAL_CONFIGURE_DATE="`date`" +OPAL_CONFIGURE_DATE="`date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}"`" # # Make automake clean emacs ~ files for "make clean" diff --git a/config/opal_get_version.m4 b/config/opal_get_version.m4 index d8648a3ad60..2552ddf1eac 100644 --- a/config/opal_get_version.m4 +++ b/config/opal_get_version.m4 @@ -12,7 +12,7 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2008-2014 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2014 Intel, Inc. All rights reserved. -dnl Copyright (c) 2014 Research Organization for Information Science +dnl Copyright (c) 2014-2017 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. dnl $COPYRIGHT$ dnl @@ -91,7 +91,7 @@ m4_define([OPAL_GET_VERSION],[ $2_REPO_REV=`git describe --tags --always` fi else - $2_REPO_REV="date`date '+%Y-%m-%d'`" + $2_REPO_REV="date`date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" '+%Y-%m-%d'`" fi fi diff --git a/ompi/tools/mpisync/Makefile.am b/ompi/tools/mpisync/Makefile.am index 3514afcc59f..60ee8d44312 100644 --- a/ompi/tools/mpisync/Makefile.am +++ b/ompi/tools/mpisync/Makefile.am @@ -33,7 +33,7 @@ AM_CFLAGS = \ -DOPAL_CONFIGURE_DATE="\"@OPAL_CONFIGURE_DATE@\"" \ -DOMPI_BUILD_USER="\"$$USER\"" \ -DOMPI_BUILD_HOST="\"`(hostname || uname -n) | sed 1q`\"" \ - -DOMPI_BUILD_DATE="\"`date`\"" \ + -DOMPI_BUILD_DATE="\"`$(top_srcdir)/config/getdate.sh`\"" \ -DOMPI_BUILD_CFLAGS="\"@CFLAGS@\"" \ -DOMPI_BUILD_CPPFLAGS="\"@CPPFLAGS@\"" \ -DOMPI_BUILD_CXXFLAGS="\"@CXXFLAGS@\"" \ diff --git a/ompi/tools/ompi_info/Makefile.am b/ompi/tools/ompi_info/Makefile.am index 296d8ba283a..5869b239227 100644 --- a/ompi/tools/ompi_info/Makefile.am +++ b/ompi/tools/ompi_info/Makefile.am @@ -29,7 +29,7 @@ AM_CFLAGS = \ -DOPAL_CONFIGURE_DATE="\"@OPAL_CONFIGURE_DATE@\"" \ -DOMPI_BUILD_USER="\"$$USER\"" \ -DOMPI_BUILD_HOST="\"`(hostname || uname -n) 2> /dev/null | sed 1q`\"" \ - -DOMPI_BUILD_DATE="\"`date`\"" \ + -DOMPI_BUILD_DATE="\"`$(top_srcdir)/config/getdate.sh`\"" \ -DOMPI_BUILD_CFLAGS="\"@CFLAGS@\"" \ -DOMPI_BUILD_CPPFLAGS="\"@CPPFLAGS@\"" \ -DOMPI_BUILD_CXXFLAGS="\"@CXXFLAGS@\"" \ diff --git a/orte/tools/orte-info/Makefile.am b/orte/tools/orte-info/Makefile.am index d1e68728401..8464fe41b1c 100644 --- a/orte/tools/orte-info/Makefile.am +++ b/orte/tools/orte-info/Makefile.am @@ -26,7 +26,7 @@ AM_CFLAGS = \ -DOPAL_CONFIGURE_DATE="\"@OPAL_CONFIGURE_DATE@\"" \ -DOMPI_BUILD_USER="\"$$USER\"" \ -DOMPI_BUILD_HOST="\"`(hostname || uname -n) | sed 1q`\"" \ - -DOMPI_BUILD_DATE="\"`date`\"" \ + -DOMPI_BUILD_DATE="\"`$(top_srcdir)/config/getdate.sh`\"" \ -DOMPI_BUILD_CFLAGS="\"@CFLAGS@\"" \ -DOMPI_BUILD_CPPFLAGS="\"@CPPFLAGS@\"" \ -DOMPI_BUILD_CXXFLAGS="\"@CXXFLAGS@\"" \ diff --git a/oshmem/tools/oshmem_info/Makefile.am b/oshmem/tools/oshmem_info/Makefile.am index a474eaf51d0..4505d1a64c6 100644 --- a/oshmem/tools/oshmem_info/Makefile.am +++ b/oshmem/tools/oshmem_info/Makefile.am @@ -18,7 +18,7 @@ AM_CPPFLAGS = \ -DOPAL_CONFIGURE_DATE="\"@OPAL_CONFIGURE_DATE@\"" \ -DOMPI_BUILD_USER="\"$$USER\"" \ -DOMPI_BUILD_HOST="\"`(hostname || uname -n) 2> /dev/null | sed 1q`\"" \ - -DOMPI_BUILD_DATE="\"`date`\"" \ + -DOMPI_BUILD_DATE="\"`$(top_srcdir)/config/getdate.sh`\"" \ -DOMPI_BUILD_CFLAGS="\"@CFLAGS@\"" \ -DOMPI_BUILD_CPPFLAGS="\"@CPPFLAGS@\"" \ -DOMPI_BUILD_CXXFLAGS="\"@CXXFLAGS@\"" \ @@ -29,6 +29,7 @@ AM_CPPFLAGS = \ -DOMPI_BUILD_LIBS="\"@LIBS@\"" \ -DOPAL_CC_ABSOLUTE="\"@OPAL_CC_ABSOLUTE@\"" \ -DOMPI_CXX_ABSOLUTE="\"@OMPI_CXX_ABSOLUTE@\"" + if OSHMEM_PROFILING AM_CPPFLAGS += -DOSHMEM_PROFILING=1 else