1
0
Fork 0
mirror of https://github.com/mlocati/docker-php-extension-installer synced 2025-05-09 00:22:40 +00:00

Add support for ext-pq (#750)

This commit is contained in:
Daniil Gentili 2023-05-28 19:29:57 +02:00 committed by GitHub
parent fb27612181
commit 480b83f3c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions

View file

@ -566,6 +566,8 @@ sortModulesToInstall() {
checkRequiredModule relay msgpack
# relay requires igbinary
checkRequiredModule relay igbinary
# pq requires raphf
checkRequiredModule pq raphf
# Some module installation may use sockets if available: move it before other modules
if stringInList 'sockets' "$PHP_MODULES_TO_INSTALL"; then
PHP_MODULES_TO_INSTALL="$(removeStringFromList 'sockets' "$PHP_MODULES_TO_INSTALL")"
@ -596,6 +598,12 @@ sortModulesToInstall() {
PHP_MODULES_TO_INSTALL="apcu $PHP_MODULES_TO_INSTALL"
PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }"
fi
# Some module installation may use raphf if available: move it before other modules
if stringInList 'raphf' "$PHP_MODULES_TO_INSTALL"; then
PHP_MODULES_TO_INSTALL="$(removeStringFromList 'raphf' "$PHP_MODULES_TO_INSTALL")"
PHP_MODULES_TO_INSTALL="raphf $PHP_MODULES_TO_INSTALL"
PHP_MODULES_TO_INSTALL="${PHP_MODULES_TO_INSTALL% }"
fi
# In any case, first of all, we need to install composer
if stringInList '@composer' "$PHP_MODULES_TO_INSTALL"; then
PHP_MODULES_TO_INSTALL="$(removeStringFromList '@composer' "$PHP_MODULES_TO_INSTALL")"
@ -1094,11 +1102,11 @@ buildRequiredPackageLists() {
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libfbclient2"
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile firebird-dev libib-util"
;;
pgsql@alpine | pdo_pgsql@alpine)
pgsql@alpine | pdo_pgsql@alpine | pq@alpine)
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent postgresql-libs"
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile postgresql-dev"
;;
pgsql@debian | pdo_pgsql@debian)
pgsql@debian | pdo_pgsql@debian | pq@debian)
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libpq5"
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libpq-dev"
;;
@ -3071,6 +3079,10 @@ installRemoteModule() {
mv "$installRemoteModule_src/include" /usr/local/include/hat-trie
fi
;;
pq)
# pq must be loaded after raphf
installRemoteModule_ini_basename="xx-php-ext-$installRemoteModule_module"
;;
propro)
if test -z "$installRemoteModule_version"; then
if test $PHP_MAJMIN_VERSION -le 506; then