Fix build of PHP-FPM 8.0 uploadprogress module

cytopia · cytopia · commit 5f719f60ce82 · 2020-03-18T07:35:45.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 #### Fixed
 - [#153](https://github.com/devilbox/docker-php-fpm/pull/153) Use numeric order for startup files
 - Fix build of PHP-FPM 7.4 snmp module
+- Fix build of PHP-FPM 8.0 uploadprogress module
 
 
 ## Release 0.105
diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2
@@ -455,7 +455,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
 	&& pecl install uploadprogress \
diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3
@@ -555,7 +555,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
 	&& pecl install uploadprogress \
diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4
@@ -574,7 +574,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
 	&& pecl install uploadprogress \
diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5
@@ -562,7 +562,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
 	&& pecl install uploadprogress \
diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6
@@ -592,7 +592,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
 	&& pecl install uploadprogress \
diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0
@@ -633,7 +633,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Version specific
+	# Installation: Generic
 	# Type:         GIT extension
 	&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
 	&& cd /tmp/uploadprogress \
diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1
@@ -642,7 +642,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Version specific
+	# Installation: Generic
 	# Type:         GIT extension
 	&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
 	&& cd /tmp/uploadprogress \
diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2
@@ -646,7 +646,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Version specific
+	# Installation: Generic
 	# Type:         GIT extension
 	&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
 	&& cd /tmp/uploadprogress \
diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3
@@ -646,7 +646,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Version specific
+	# Installation: Generic
 	# Type:         GIT extension
 	&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
 	&& cd /tmp/uploadprogress \
diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4
@@ -595,7 +595,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Version specific
+	# Installation: Generic
 	# Type:         GIT extension
 	&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
 	&& cd /tmp/uploadprogress \
diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0
@@ -453,22 +453,15 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Version specific
+	# Installation: Generic
 	# Type:         GIT extension
 	&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
 	&& cd /tmp/uploadprogress \
-	# Custom:       Install command
-	&& true \
-# FIXME: This is a work-around to mitigate compile error with PHP 8.0
-&& rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC)/)/g' || true \
-&& rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC,/,/g' || true \
-&& rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC)/)/g' || true \
-&& rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC,/,/g' || true \
-&& phpize \
-&& ./configure --enable-uploadprogress \
-&& make \
-&& make install \
- \
+	# Default:      Install command
+	&& phpize \
+	&& ./configure  --enable-uploadprogress \
+	&& make -j$(getconf _NPROCESSORS_ONLN) \
+	&& make install \
 	# Enabling
 	&& docker-php-ext-enable uploadprogress \
 	&& true
diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml
@@ -977,42 +977,20 @@ extensions_available:
   tokenizer:
     already_avail: "{{ php_all_versions }}"
   uploadprogress:
-    7.0:
-      type: git
-      git_url: https://github.com/php/pecl-php-uploadprogress
-      configure: --enable-uploadprogress
-    7.1:
-      type: git
-      git_url: https://github.com/php/pecl-php-uploadprogress
-      configure: --enable-uploadprogress
-    7.2:
-      type: git
-      git_url: https://github.com/php/pecl-php-uploadprogress
-      configure: --enable-uploadprogress
-    7.3:
-      type: git
-      git_url: https://github.com/php/pecl-php-uploadprogress
-      configure: --enable-uploadprogress
-    7.4:
+    5.2:
+      type: pecl
+    5.3:
+      type: pecl
+    5.4:
+      type: pecl
+    5.5:
+      type: pecl
+    5.6:
+      type: pecl
+    all:
       type: git
       git_url: https://github.com/php/pecl-php-uploadprogress
       configure: --enable-uploadprogress
-    8.0:
-      type: git
-      git_url: https://github.com/php/pecl-php-uploadprogress
-      command: |
-        true \
-        # FIXME: This is a work-around to mitigate compile error with PHP 8.0
-        && rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC)/)/g' || true \
-        && rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC,/,/g' || true \
-        && rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC)/)/g' || true \
-        && rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC,/,/g' || true \
-        && phpize \
-        && ./configure --enable-uploadprogress \
-        && make \
-        && make install \
-    all:
-      type: pecl
   wddx:
     # https://wiki.php.net/rfc/deprecate-and-remove-ext-wddx
     disabled: [7.4, 8.0]
