Skip to content

Commit eb77c2c

Browse files
committed
Merge branch 'PHP-7.1' into PHP-7.2
2 parents d9a110a + 8a179fa commit eb77c2c

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

NEWS

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ PHP NEWS
2020
(Daniel Ciochiu)
2121
. Fixed bug #75074 (php-process crash when is_file() is used with strings
2222
longer 260 chars). (Anatol)
23+
. Fixed bug #69727 (Remove timestamps from build to make it reproducible).
24+
(jelle van der Waa)
2325

2426
- CLI server:
2527
. Fixed bug #73830 (Directory does not exist). (Anatol)

configure.ac

+2-1
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,8 @@ fi
12681268
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
12691269
EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
12701270

1271-
PHP_BUILD_DATE=`date '+%Y-%m-%d'`
1271+
# SOURCE_DATE_EPOCH for reproducible builds https://reproducible-builds.org/specs/source-date-epoch/
1272+
PHP_BUILD_DATE=`date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d`
12721273
AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date])
12731274

12741275
PHP_UNAME=`uname -a | xargs`

0 commit comments

Comments
 (0)