Merge pull request #286 from mlocati/geospatial

Add support for geospatial
pull/288/head
Michele Locati 2021-01-31 14:55:00 +01:00 committed by GitHub
commit 08f1a08f18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 11 deletions

View File

@ -13,6 +13,7 @@ exif 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0
ffi 7.4 8.0 ffi 7.4 8.0
gd 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 gd 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0
gearman 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 gearman 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0
geospatial 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0
gettext 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 gettext 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0
gmagick 5.5 5.6 7.0 7.1 7.2 7.3 7.4 gmagick 5.5 5.6 7.0 7.1 7.2 7.3 7.4
gmp 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 gmp 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0

View File

@ -1093,7 +1093,7 @@ setTargetTriplet() {
# The number of processors to be used # The number of processors to be used
getCompilationProcessorCount() { getCompilationProcessorCount() {
case "$1" in case "$1" in
amqp | bcmath | bz2 | calendar | exif | gd | gettext | grpc | http | imagick | intl | mysqli | opcache | pcntl | pdo_mysql | protobuf | redis | ssh2 | soap | sockets | tidy | xdebug | xsl | yaml | zip) amqp | bcmath | bz2 | calendar | exif | gd | geospatial | gettext | grpc | http | imagick | intl | mysqli | opcache | pcntl | pdo_mysql | protobuf | redis | ssh2 | soap | sockets | tidy | xdebug | xsl | yaml | zip)
# These extensions support parallel compilation # These extensions support parallel compilation
getProcessorCount getProcessorCount
;; ;;
@ -1564,6 +1564,15 @@ installRemoteModule() {
;; ;;
esac esac
;; ;;
geospatial)
if test -z "$installRemoteModule_version"; then
if test $PHP_MAJMIN_VERSION -le 506; then
installRemoteModule_version=0.2.1
else
installRemoteModule_version=beta
fi
fi
;;
gmagick) gmagick)
if test -z "$installRemoteModule_version"; then if test -z "$installRemoteModule_version"; then
if test $PHP_MAJMIN_VERSION -le 506; then if test $PHP_MAJMIN_VERSION -le 506; then
@ -2301,19 +2310,14 @@ installPeclPackage() {
printf '\n' >"$CONFIGURE_FILE" printf '\n' >"$CONFIGURE_FILE"
fi fi
installPeclPackage_name="$(getPeclModuleName "$1")" installPeclPackage_name="$(getPeclModuleName "$1")"
if test $USE_PICKLE -eq 0; then
if test -z "${2:-}"; then if test -z "${2:-}"; then
installPeclPackage_fullname="$installPeclPackage_name" installPeclPackage_fullname="$installPeclPackage_name"
else else
installPeclPackage_fullname="$installPeclPackage_name-$2" installPeclPackage_fullname="$installPeclPackage_name-$2"
fi fi
if test $USE_PICKLE -eq 0; then
cat "$CONFIGURE_FILE" | MAKE="make -j$(getCompilationProcessorCount $1)" CPPFLAGS="${3:-}" pecl install "$installPeclPackage_fullname" cat "$CONFIGURE_FILE" | MAKE="make -j$(getCompilationProcessorCount $1)" CPPFLAGS="${3:-}" pecl install "$installPeclPackage_fullname"
else else
if test -z "${2:-}"; then
installPeclPackage_fullname="$installPeclPackage_name"
else
installPeclPackage_fullname="$installPeclPackage_name@$2"
fi
MAKE="make -j$(getCompilationProcessorCount $1)" CPPFLAGS="${3:-}" /tmp/pickle install --tmp-dir=/tmp/pickle.tmp --no-interaction --version-override='' --with-configure-options "$CONFIGURE_FILE" -- "$installPeclPackage_fullname" MAKE="make -j$(getCompilationProcessorCount $1)" CPPFLAGS="${3:-}" /tmp/pickle install --tmp-dir=/tmp/pickle.tmp --no-interaction --version-override='' --with-configure-options "$CONFIGURE_FILE" -- "$installPeclPackage_fullname"
fi fi
} }