X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fpecl-ci;a=blobdiff_plain;f=Makefile;h=411aaeaac18116c07622ed93d5d045978aa6f28c;hp=8b49d3e47e760e4f4df935595f0808d71dc3342d;hb=HEAD;hpb=e337dcd7cdbbd9dd6d720eb4645f9f02a041dafa diff --git a/Makefile b/Makefile index 8b49d3e..411aaea 100644 --- a/Makefile +++ b/Makefile @@ -91,7 +91,11 @@ php: check $(bindir)/php | $(PECL_INI) -for EXT_SONAME in $(extdir)/*.so; do \ EXT_SONAME=$$(basename $$EXT_SONAME); \ if test "$$EXT_SONAME" != "*.so" && ! grep -q extension=$$EXT_SONAME $(PECL_INI); then \ - echo extension=$$EXT_SONAME >> $(PECL_INI); \ + if test "$$EXT_SONAME" = "opcache.so"; then \ + echo zend_extension=$$EXT_SONAME >> $(PECL_INI); \ + else \ + echo extension=$$EXT_SONAME >> $(PECL_INI); \ + fi; \ fi \ done @@ -115,7 +119,6 @@ $(srcdir) $(extdir) $(with_config_file_scan_dir): .PHONY: pecl-check pecl-check: @if test -z "$(PECL)"; then echo "No pecl extension specified, e.g. PECL=pecl_http:http"; exit 1; fi - if test -d $(PECL_DIR)/.git; then cd $(PECL_DIR)/; git pull || test -z "$$CI"; fi .PHONY: pecl-clean pecl-clean: @@ -176,7 +179,7 @@ test: php pecl-test: TESTS ?= $(PECL_DIR)/tests pecl-test: php REPORT_EXIT_STATUS=1 $(bindir)/php $(prefix)/lib/php/build/run-tests.php -q -p $(bindir)/php --set-timeout 300 --show-diff $(TESTS) - + pharext/%: $(PECL_INI) php | $(srcdir)/../%.ext.phar for phar in $|; do $(bindir)/php $$phar --prefix=$(prefix) --ini=$(PECL_INI); done