archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix #78788: ./configure generates invalid php_version.h

Browse source 
Change $SED to "${SED}" such that the IFS is not used to split the
output of that variable.
This commit is contained in:
max 2019-11-07 07:45:55 +01:00 • committed by Christoph M. Becker
parent f494a36618
commit 0988f69634
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -4,6 +4,7 @@ PHP NEWS
- Core: - Core:
. Fixed bug #78768 (redefinition of typedef zend_property_info). (Nikita) . Fixed bug #78768 (redefinition of typedef zend_property_info). (Nikita)
. Fixed bug #78788 (./configure generates invalid php_version.h). (max)
- Standard: - Standard:
. Fixed bug #77930 (stream_copy_to_stream should use mmap more often). . Fixed bug #77930 (stream_copy_to_stream should use mmap more often).

12
configure.ac
View file

@ -109,7 +109,7 @@ extern "C++" {
]) ])
ac_IFS=$IFS; IFS="." ac_IFS=$IFS; IFS="."
set $(echo AC_PACKAGE_VERSION | $SED 's/\([[0-9\.]]*\)\(.*\)/\1\.\2/') set $(echo AC_PACKAGE_VERSION | "${SED}" 's/\([[0-9\.]]*\)\(.*\)/\1\.\2/')
IFS=$ac_IFS IFS=$ac_IFS
PHP_MAJOR_VERSION=[$]1 PHP_MAJOR_VERSION=[$]1
PHP_MINOR_VERSION=[$]2 PHP_MINOR_VERSION=[$]2
@ -806,8 +806,8 @@ if test "$PHP_GCOV" = "yes"; then
dnl Remove all optimization flags from CFLAGS. dnl Remove all optimization flags from CFLAGS.
changequote({,}) changequote({,})
CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'` CFLAGS=`echo "$CFLAGS" | "${SED}" -e 's/-O[0-9s]*//g'`
CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'` CXXFLAGS=`echo "$CXXFLAGS" | "${SED}" -e 's/-O[0-9s]*//g'`
changequote([,]) changequote([,])
dnl Add the special gcc flags. dnl Add the special gcc flags.
@ -826,8 +826,8 @@ if test "$PHP_DEBUG" = "yes"; then
PHP_DEBUG=1 PHP_DEBUG=1
ZEND_DEBUG=yes ZEND_DEBUG=yes
changequote({,}) changequote({,})
CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'` CFLAGS=`echo "$CFLAGS" | "${SED}" -e 's/-O[0-9s]*//g'`
CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'` CXXFLAGS=`echo "$CXXFLAGS" | "${SED}" -e 's/-O[0-9s]*//g'`
changequote([,]) changequote([,])
dnl Add -O0 only if GCC or ICC is used. dnl Add -O0 only if GCC or ICC is used.
if test "$GCC" = "yes" || test "$ICC" = "yes"; then if test "$GCC" = "yes" || test "$ICC" = "yes"; then
@ -1210,7 +1210,7 @@ libdir=`eval echo $libdir`
datadir=`eval eval echo $datadir` datadir=`eval eval echo $datadir`
dnl Build extension directory path. dnl Build extension directory path.
ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|$SED 's/#define ZEND_MODULE_API_NO //'` ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|"${SED}" 's/#define ZEND_MODULE_API_NO //'`
if test -z "$EXTENSION_DIR"; then if test -z "$EXTENSION_DIR"; then
extbasedir=$ZEND_MODULE_API_NO extbasedir=$ZEND_MODULE_API_NO