com php-src: Merge branch 'PHP-7.3': .gitignore scripts/phpize.in scripts/phpize.m4
| From: | Peter Kokot | Date: | Thu, 18 Oct 2018 22:12:48 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.3': .gitignore scripts/phpize.in scripts/phpize.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-103513@lists.php.net to get a copy of this message | ||
Commit: 1257664ca2d1403a27e696808eb818c0b92a4eb3
Author: Peter Kokot <peterkokot@gmail.com> Fri, 19 Oct 2018 00:12:48 +0200
Parents: 00db0e7a0424ef23086557de1a1eda070596f05e 2224277d7d7efb06adcb512427e299295876fb87
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1257664ca2d1403a27e696808eb818c0b92a4eb3
Log:
Merge branch 'PHP-7.3'
* PHP-7.3:
[ci skip] Update NEWS
[ci skip] Update NEWS
[ci skip] Update NEWS
Fix #77035: The phpize and ./configure create redundant .deps file
Bugs:
https://bugs.php.net/77035
Changed paths:
MM .gitignore
MM scripts/phpize.in
MM scripts/phpize.m4
Diff:
diff --cc scripts/phpize.in
index 26ecfc6,74e8bc3..3e86385
--- a/scripts/phpize.in
+++ b/scripts/phpize.in
@@@ -9,9 -9,9 +9,9 @@@ includedir="
eval echo @includedir@/ph
builddir="pwd"
SED="@SED@"
-FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4
ax_gcc_func_attribute.m4"
+FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4
ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx..m4"
FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
- CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ modules/ install-sh \
+ CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ install-sh \
mkinstalldirs missing config.nice config.sub config.guess configure configure.ac \
aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache autom4te.cache/ \
config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h \