diff options
| author | Greg Beaver <cellog@php.net> | 2007-11-22 18:26:27 +0000 |
|---|---|---|
| committer | Greg Beaver <cellog@php.net> | 2007-11-22 18:26:27 +0000 |
| commit | 1eba759f3bb2285d6a066fb6dd1165d7868590ff (patch) | |
| tree | b723c266991d993cc2782eca84dee937ee9c0750 | |
| parent | 34952edb0b425199b6574c4e925bded09fa76346 (diff) | |
| download | php-git-1eba759f3bb2285d6a066fb6dd1165d7868590ff.tar.gz | |
fix Bug #11950 make pharcmd use installed phar.so, not build one [remicollet]
| -rwxr-xr-x | ext/phar/Makefile.frag | 6 | ||||
| -rw-r--r-- | ext/phar/package.php | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag index abe8e184ee..c644cd1383 100755 --- a/ext/phar/Makefile.frag +++ b/ext/phar/Makefile.frag @@ -5,9 +5,11 @@ $(srcdir)/phar_path_check.c: $(srcdir)/phar_path_check.re pharcmd: $(builddir)/phar.php $(builddir)/phar.phar $(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php - $(PHP_EXECUTABLE) $(srcdir)/build_precommand.php > $(builddir)/phar.php + $(PHP_EXECUTABLE) -n -q -d extension_dir=$(builddir)/modules -d +extension=phar.so $(srcdir)/build_precommand.php > $(builddir)/phar.php $(builddir)/phar.phar: $(builddir)/phar.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php - $(PHP_EXECUTABLE) -d phar.readonly=0 $(srcdir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x CVS -p 0 -s $(srcdir)/phar/phar.php -h sha1 $(srcdir)/phar/ + $(PHP_EXECUTABLE) -n -q -d extension_dir=$(builddir)/modules -d +extension=phar.so -d phar.readonly=0 $(srcdir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x CVS -p 0 -s $(srcdir)/phar/phar.php -h sha1 $(srcdir)/phar/ @chmod +x $(builddir)/phar.phar diff --git a/ext/phar/package.php b/ext/phar/package.php index 96dd2bbc49..21f85eecb1 100644 --- a/ext/phar/package.php +++ b/ext/phar/package.php @@ -5,6 +5,7 @@ $notes = ' $a = new Phar(\'blah.phar\'); * fix creation and read of Phar objects on Windows, manage windows path separators (on windows only) + * fix Bug #11950: make pharcmd use installed phar.so, not build one [remicollet] '; if (!class_exists("Phar") && !extension_loaded("Phar")) { |