diff options
| author | Anatol Belski <ab@php.net> | 2018-03-05 22:38:03 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-03-05 22:38:03 +0100 |
| commit | b53f326f67e84bf09ab542697dadac046010ca7a (patch) | |
| tree | 174e6a9227e442c93cb7c03fa71e1ce4b86f11a2 | |
| parent | 53baf6fa1d510e54980605d07398a1e1ad445cfc (diff) | |
| parent | 60ac2558974bf63a5f07664a53e1502835a24998 (diff) | |
| download | php-git-b53f326f67e84bf09ab542697dadac046010ca7a.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76044 'date: illegal option -- -' in ./configure on FreeBSD
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index dcda2b5f1a..3491dd4a36 100644 --- a/configure.ac +++ b/configure.ac @@ -1269,7 +1269,10 @@ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS" EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS" # SOURCE_DATE_EPOCH for reproducible builds https://reproducible-builds.org/specs/source-date-epoch/ -PHP_BUILD_DATE=`date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d` +PHP_BUILD_DATE=`date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d 2>/dev/null` +if test $? -ne 0 ; then +PHP_BUILD_DATE=`date -u +%Y-%m-%d` +fi AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) PHP_UNAME=`uname -a | xargs` |