Merge pull request #8518 from neheb/i
[feed/packages.git] / lang / php7 / patches / 1004-disable-phar-command.patch
1 --- a/ext/phar/config.m4 2016-08-17 21:50:58.000000000 +0200
2 +++ b/ext/phar/config.m4 2016-09-20 22:21:28.494934775 +0200
3 @@ -26,7 +26,7 @@
4 fi
5 PHP_ADD_EXTENSION_DEP(phar, hash, true)
6 PHP_ADD_EXTENSION_DEP(phar, spl, true)
7 - PHP_ADD_MAKEFILE_FRAGMENT
8 + #PHP_ADD_MAKEFILE_FRAGMENT
9
10 PHP_INSTALL_HEADERS([ext/phar], [php_phar.h])
11
12 --- a/configure.ac 2016-09-20 22:26:38.000000000 +0200
13 +++ b/configure.ac 2016-09-20 22:42:30.380101556 +0200
14 @@ -1454,13 +1454,13 @@
15 INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
16 CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)"
17
18 -if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then
19 - pharcmd=pharcmd
20 - pharcmd_install=install-pharcmd
21 -else
22 +#if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then
23 +# pharcmd=pharcmd
24 +# pharcmd_install=install-pharcmd
25 +#else
26 pharcmd=
27 pharcmd_install=
28 -fi;
29 +#fi;
30
31 all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd"
32 install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install"