]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Mon, 5 Mar 2018 21:38:03 +0000 (22:38 +0100)
committerAnatol Belski <ab@php.net>
Mon, 5 Mar 2018 21:38:03 +0000 (22:38 +0100)
* PHP-7.1:
  Fixed bug #76044 'date: illegal option -- -' in ./configure on FreeBSD

1  2 
configure.ac

diff --cc configure.ac
index dcda2b5f1af3cde87f538c1662ff8c14752c7dd1,af11873d6773d30ed4a820df062e243bc17583f9..3491dd4a3669a582ab0ddf67fa41ced47fc5e1c8
@@@ -1269,13 -1286,26 +1269,16 @@@ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFL
  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])
  
 -case $host_alias in
 -*netware*)
 -  PHP_OS="NetWare"
 -  PHP_UNAME="NetWare"
 -  AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[hardcode for each of the cross compiler host])
 -  AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[hardcode for each of the cross compiler host])
 -  ;;
 -*)
 -  PHP_UNAME=`uname -a | xargs`
 -  AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
 -  PHP_OS=`uname | xargs`
 -  AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
 -  ;;
 -esac
 +PHP_UNAME=`uname -a | xargs`
 +AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
 +PHP_OS=`uname | xargs`
 +AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
  
  PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)