diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-12-15 22:04:24 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-12-15 22:04:34 +0100 |
| commit | eb77c2c2a7164622e920befab0aaff6d2edc12a1 (patch) | |
| tree | bca3a26564cd59a9a34f8aef91986a2422da3080 | |
| parent | d9a110a2946c4e3a2eaf6eaf30c7fbbb0e45e20a (diff) | |
| parent | 8a179fa02b50685fba47e7d19af922b07791d616 (diff) | |
| download | php-git-eb77c2c2a7164622e920befab0aaff6d2edc12a1.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -20,6 +20,8 @@ PHP NEWS (Daniel Ciochiu) . Fixed bug #75074 (php-process crash when is_file() is used with strings longer 260 chars). (Anatol) + . Fixed bug #69727 (Remove timestamps from build to make it reproducible). + (jelle van der Waa) - CLI server: . Fixed bug #73830 (Directory does not exist). (Anatol) diff --git a/configure.ac b/configure.ac index f7800250fe..a9ef3f6a82 100644 --- a/configure.ac +++ b/configure.ac @@ -1268,7 +1268,8 @@ fi EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS" EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS" -PHP_BUILD_DATE=`date '+%Y-%m-%d'` +# SOURCE_DATE_EPOCH for reproducible builds https://reproducible-builds.org/specs/source-date-epoch/ +PHP_BUILD_DATE=`date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d` AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) PHP_UNAME=`uname -a | xargs` |