[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Makefile.global
Commit:67df40fd54b65a62340bfd107ee29e2390a92dca Author:Christopher Jones s...@php.net Tue, 1 Oct 2013 10:35:03 -0700 Parents: 471413ab19f1052d2f7e950229d661547f6e1657 60e38b3243577abc80ce6bbcfb0b4125b08acb85 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=67df40fd54b65a62340bfd107ee29e2390a92dca Log: Merge branch 'PHP-5.5' * PHP-5.5: Revert Make 'make distclean' remove the downloaded pear PHAR Changed paths: MM Makefile.global Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Makefile.global
Commit:86c3378c5c9c1ac76d989e5718ff2a3236ed46bc Author:Christopher Jones s...@php.net Mon, 30 Sep 2013 15:47:33 -0700 Parents: 675703335513d6ad3d861a9d03379fdc931b46bf d7baf0427fb56cbde55495e5c2071b1cdacb94ce Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=86c3378c5c9c1ac76d989e5718ff2a3236ed46bc Log: Merge branch 'PHP-5.5' * PHP-5.5: Make 'make distclean' remove the downloaded pear PHAR Changed paths: MM Makefile.global Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Makefile.global
Commit:1c91ca990ff673edf8aa521285986759996f0cca Author:Christopher Jones s...@php.net Thu, 1 Aug 2013 08:49:19 -0700 Parents: 1f6b940dd1b5d43fc2f846a2a85babb342749f05 146b933ab49f8068a5fe983bcb5c821e103e575e Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1c91ca990ff673edf8aa521285986759996f0cca Log: Merge branch 'PHP-5.5' * PHP-5.5: Revert Allow 'make distclean' to clean up the 'generated' phar.inc Changed paths: MM Makefile.global Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Makefile.global
Commit:9cd1ac7b61a473232d867c3eb69bfb8525f0d951 Author:Christopher Jones s...@php.net Thu, 1 Aug 2013 09:22:47 -0700 Parents: 1c91ca990ff673edf8aa521285986759996f0cca d884ec15e93fa153c845961f5e4c35ef9240eedd Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9cd1ac7b61a473232d867c3eb69bfb8525f0d951 Log: Merge branch 'PHP-5.5' * PHP-5.5: Clean up the 'generated' phar.inc file. When building outside the source tree the copied phar.inc needs to be removed, but when building in the tree, the file must remain since it is part of the source. See the copying logic in ext/phar/Makefile.frag. Changed paths: MM Makefile.global Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Makefile.global
Commit:f5521a357ad77fd71e6e783711c206a063bfebb3 Author:Christopher Jones s...@php.net Wed, 31 Jul 2013 10:00:05 -0700 Parents: f3c3aa8a676518728d3dab90deb03f3354113b0f e3a4b87e899ac55995f783e52379801973e199e7 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f5521a357ad77fd71e6e783711c206a063bfebb3 Log: Merge branch 'PHP-5.5' * PHP-5.5: Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file Bugs: https://bugs.php.net/62691 Changed paths: MM Makefile.global Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Makefile.global
Commit:1f6b940dd1b5d43fc2f846a2a85babb342749f05 Author:Christopher Jones s...@php.net Wed, 31 Jul 2013 12:36:20 -0700 Parents: 8bff800f6ae3b72453b2827c64bc9c38c62b0cab c069b5f571f0d5d28d8f12cbf795155fe4c1c90b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1f6b940dd1b5d43fc2f846a2a85babb342749f05 Log: Merge branch 'PHP-5.5' * PHP-5.5: Use PHP's major version when cleaning up Apache .module files Allow 'make distclean' to clean up the 'generated' phar.inc Changed paths: MM Makefile.global Diff: diff --cc Makefile.global index 292c8c9,73fcdda..52070ed --- a/Makefile.global +++ b/Makefile.global @@@ -118,14 -118,13 +118,13 @@@ clean rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/* distclean: clean - rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h + rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module sapi/apache_hooks/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h rm -f php5.spec main/build-defs.h scripts/phpize - rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/mysqlnd/php_mysqlnd_config.h + rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/mysqlnd/php_mysqlnd_config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 ext/phar/phar.1 ext/phar/phar.phar.1 - rm -f sapi/apache/libphp5.module sapi/apache_hooks/libphp5.module rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h ext/iconv/php_php_iconv_impl.h - rm -f ext/phar/phar.phar ext/phar/phar.php + rm -f ext/phar/phar.phar ext/phar/phar.php ext/phar/phar/phar.inc $(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*//'|xargs rm -f .PHONY: all clean install distclean test -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
