redirect 30X

[m6w6/travis-pecl] / Makefile

diff --git a/Makefile b/Makefile
index 20f28299ba147ac28b927495d571b735e501377c..d20e6a420344dd344d47b76f844227aabb84ab6e 100644 (file)
--- 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
 
@@ -79,7 +79,7 @@ check: $(PHP_RELEASES)
 
 .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 +134,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