From 2ca480b37e9b22b203d2caa17c2825de1f0c4cea Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Tue, 17 Dec 2019 11:14:04 +0100 Subject: [PATCH] Support opencensus for PHP 7.3 and 7.4 --- data/supported-extensions | 2 +- install-php-extensions | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/data/supported-extensions b/data/supported-extensions index 0e06192..96cb068 100644 --- a/data/supported-extensions +++ b/data/supported-extensions @@ -28,7 +28,7 @@ mysql 5.6 mysqli 5.6 7.0 7.1 7.2 7.3 7.4 odbc 5.6 7.0 7.1 7.2 7.3 7.4 opcache 5.6 7.0 7.1 7.2 7.3 7.4 -opencensus 7.0 7.1 7.2 +opencensus 7.0 7.1 7.2 7.3 7.4 parallel 7.1 7.2 7.3 7.4 pcntl 5.6 7.0 7.1 7.2 7.3 7.4 pcov 7.0 7.1 7.2 7.3 7.4 diff --git a/install-php-extensions b/install-php-extensions index 2979600..c59bf88 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -813,6 +813,7 @@ installPECLModule () { printf '### INSTALLING PECL MODULE %s ###\n' "$2" installPECLModule_actual="$2" installPECLModule_stdin='\n' + installPECLModule_manuallyInstalled=0 case "$2" in apcu) if test $1 -le 506; then @@ -856,7 +857,18 @@ installPECLModule () { fi ;; opencensus) - installPECLModule_actual="$2-alpha" + if test $1 -le 702; then + installPECLModule_actual="$2-alpha" + else + installPECLModule_manuallyInstalled=1 + installPECLModule_src="$(getPackageSource https://pecl.php.net/get/opencensus)" + cd "$installPECLModule_src"/opencensus-* + find . -name '*.c' -type f -exec sed -i 's/\bZVAL_DESTRUCTOR\b/zval_dtor/g' {} + + phpize + ./configure + make install + cd - + fi ;; parallel) if test $1 -le 701; then @@ -932,10 +944,12 @@ installPECLModule () { fi ;; esac - if test "$2" != "$installPECLModule_actual"; then - printf ' (installing version %s)\n' "$installPECLModule_actual" + if test $installPECLModule_manuallyInstalled -eq 0; then + if test "$2" != "$installPECLModule_actual"; then + printf ' (installing version %s)\n' "$installPECLModule_actual" + fi + printf "$installPECLModule_stdin" | pecl install "$installPECLModule_actual" fi - printf "$installPECLModule_stdin" | pecl install "$installPECLModule_actual" docker-php-ext-enable "$2" }