X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile;h=e0e3a6b836f7e20b9a5d9fa07c74e5eb4b618f99;hb=180b4945beb4d4a274ab640f9a18b88dbc9065a5;hp=20f28299ba147ac28b927495d571b735e501377c;hpb=b6683bb97ca8618dacf7d101e5844d1bb1b2838a;p=m6w6%2Fpecl-ci

diff --git a/Makefile b/Makefile
index 20f2829..e0e3a6b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 export
 
-PHP ?= 7.2
+PHP ?= 7.3
 JOBS ?= 2
-PHP_MIRROR ?= http://us2.php.net/distributions/
+PHP_MIRROR ?= https://php.net/distributions/
 TMPDIR ?= /tmp
 
 makdir := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
@@ -62,9 +62,9 @@ versions: $(PHP_RELEASES)
 
 $(PHP_RELEASES): $(makdir)/php-version-url-dist.php $(makdir)/php-version-url-qa.php | $(srcdir)
 	cd $(makdir) && printf "master\tmaster\t%s/fetch-master.sh\n" $$(pwd) >$@
-	curl -Ss "http://php.net/releases/index.php?json&version=7&max=-1" | $(makdir)/php-version-url-dist.php >>$@
-	curl -Ss "http://php.net/releases/index.php?json&version=5&max=-1" | $(makdir)/php-version-url-dist.php >>$@
-	curl -Ss "http://qa.php.net/api.php?type=qa-releases&format=json"  | $(makdir)/php-version-url-qa.php   >>$@
+	curl -sSL "https://php.net/releases/index.php?json&version=7&max=-1" | $(makdir)/php-version-url-dist.php >>$@
+	curl -sSL "https://php.net/releases/index.php?json&version=5&max=-1" | $(makdir)/php-version-url-dist.php >>$@
+	curl -sSL "https://qa.php.net/api.php?type=qa-releases&format=json"  | $(makdir)/php-version-url-qa.php   >>$@
 
 ## -- PHP
 
@@ -75,11 +75,12 @@ clean:
 .PHONY: check
 check: $(PHP_RELEASES)
 	@if test -z "$(PHP)"; then echo "No php version specified, e.g. PHP=5.6"; exit 1; fi
+	@if test -z "$(PHP_VERSION)"; then echo "No PHP version akin to $(PHP) available"; exit 1; fi
 	if test -d $(srcdir)/php-$(PHP_VERSION)/.git; then cd $(srcdir)/php-$(PHP_VERSION)/; git pull; fi
 
 .PHONY: reconf
 reconf: check $(srcdir)/php-$(PHP_VERSION)/configure
-	cd $(srcdir)/php-$(PHP_VERSION) && ./configure --cache-file=config.cache --prefix=$(prefix)
+	cd $(srcdir)/php-$(PHP_VERSION) && ./configure --cache-file=config.cache --prefix=$(prefix) && rm -f sapi/cli/php
 
 .PHONY: php
 php: check $(bindir)/php | $(PECL_INI)
@@ -134,7 +135,7 @@ $(PECL_DIR)/config.m4:
 		fi; \
 	else \
 		mkdir -p $(PECL_DIR); \
-		curl -Ss $(PECL_MIRROR)/$(PECL_EXTENSION)$(if $(PECL_VERSION),/$(PECL_VERSION)) \
+		curl -LSs $(PECL_MIRROR)/$(PECL_EXTENSION)$(if $(PECL_VERSION),/$(PECL_VERSION)) \
 			| tar xz --strip-components 1 -C $(PECL_DIR); \
 	fi