From e3fc02766a979674acdf06417e2bdf6d8ddca59a Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Wed, 23 Mar 2022 10:55:44 +0100 Subject: [PATCH] Add support for memprof on Debian (#530) --- data/special-requirements | 1 + data/supported-extensions | 1 + install-php-extensions | 18 ++++++++++++++++++ scripts/ci-test-extensions | 11 +++++++++++ 4 files changed, 31 insertions(+) diff --git a/data/special-requirements b/data/special-requirements index 9754d26..f8fd775 100644 --- a/data/special-requirements +++ b/data/special-requirements @@ -1,3 +1,4 @@ +memprof !alpine parallel zts pdo_sqlsrv !alpine3.7 !alpine3.8 pthreads zts diff --git a/data/supported-extensions b/data/supported-extensions index d9725aa..0852083 100644 --- a/data/supported-extensions +++ b/data/supported-extensions @@ -43,6 +43,7 @@ maxminddb 7.2 7.3 7.4 8.0 8.1 mcrypt 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 memcache 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 memcached 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 +memprof 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 mongo 5.5 5.6 mongodb 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 mosquitto 5.5 5.6 7.0 7.1 7.2 7.3 7.4 diff --git a/install-php-extensions b/install-php-extensions index da86a9f..ef06791 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -793,6 +793,15 @@ buildRequiredPackageLists() { buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent ^libmaxminddb[0-9]*$" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libmaxminddb-dev" ;; + memprof@alpine) + # Only available in testing + buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent judy" + buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile judy-dev" + ;; + memprof@debian) + buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libjudydebian1" + buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libjudy-dev" + ;; mcrypt@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libmcrypt" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libmcrypt-dev" @@ -2413,6 +2422,15 @@ installRemoteModule() { addConfigureOption 'enable-memcached-session' 'yes' fi ;; + memprof) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -le 506; then + installRemoteModule_version=1.0.0 + elif test $PHP_MAJMIN_VERSION -le 700; then + installRemoteModule_version=2.1.0 + fi + fi + ;; mongo) if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" '1.5.0') -ge 0; then # Build with Cyrus SASL (MongoDB Enterprise Authentication) support? diff --git a/scripts/ci-test-extensions b/scripts/ci-test-extensions index a92bbe9..da995df 100755 --- a/scripts/ci-test-extensions +++ b/scripts/ci-test-extensions @@ -118,9 +118,20 @@ filterUnsupportedExensionsForDistro() { fi filterUnsupportedExensionsForDistro_filtered='' IFS=' ' + case "$IPETEST_DOCKER_DISTRO" in + alpine*) + filterUnsupportedExensionsForDistro_baseDistro="alpine" + ;; + *) + filterUnsupportedExensionsForDistro_baseDistro="debian" + ;; + esac + for filterUnsupportedExensionsForDistro_extension in $EXTENSIONS_TO_BE_TESTED; do if stringInList "!$IPETEST_DOCKER_DISTRO" "$(cat "$filterUnsupportedExensionsForDistro_reqs" | grep -E "^$filterUnsupportedExensionsForDistro_extension[ \t]")"; then printf 'Note: extension "%s" is not supported for distro "%s"\n' "$filterUnsupportedExensionsForDistro_extension" "$IPETEST_DOCKER_DISTRO" + elif stringInList "!$filterUnsupportedExensionsForDistro_baseDistro" "$(cat "$filterUnsupportedExensionsForDistro_reqs" | grep -E "^$filterUnsupportedExensionsForDistro_extension[ \t]")"; then + printf 'Note: extension "%s" is not supported for distro "%s"\n' "$filterUnsupportedExensionsForDistro_extension" "$filterUnsupportedExensionsForDistro_baseDistro" else filterUnsupportedExensionsForDistro_filtered="$filterUnsupportedExensionsForDistro_filtered $filterUnsupportedExensionsForDistro_extension" fi