Fix ./makedist wrt. to GH move

We can no longer export from git.php.net, and apparently exporting from
Github is not supported.  We apply a quick fix to export from the local
clone by default, still leaving an option to export from some other
repo.  This is, unfortunately, a minor BC break in a security release.

Co-authored-by: Remi Collet <remi@php.net>

Closes GH-6919.

(cherry picked from commit 096f148c61)
This commit is contained in:
Christoph M. BeckerandRemi Collet committed 2021-04-27 15:53:53 +02:00
1 parent 29afa7c7df
commit eb7cdb8f4a
1 file changed
+5 -3
+5 -3
View File
@@ -40,8 +40,10 @@ if test "${2}" -lt "13" -o "${2}" -eq "13" -a "${3}" -lt "5"; then
fi
IFS="$old_IFS"
if test "x$PHPROOT" = "x"; then
PHPROOT=git@git.php.net:php-src.git;
if test "x$PHPROOT" != "x"; then
remote_option=--remote=$PHPROOT
else
remote_option=
fi
LT_TARGETS='ltconfig ltmain.sh config.guess config.sub'
@@ -72,7 +74,7 @@ fi
# Export PHP
$ECHO_N "makedist: exporting tag 'php-$VER' from '$PHPROOT'...$ECHO_C"
git archive --format=tar --remote=$PHPROOT refs/tags/php-$VER --prefix=php-$VER/ | (cd $MY_OLDPWD; tar xvf -) || exit 4
git archive --format=tar $remote_option refs/tags/php-$VER --prefix=php-$VER/ | (cd $MY_OLDPWD; tar xvf -) || exit 4
echo ""
cd $DIR || exit 5