Make PHP version configurable (default=8.0.24)

Author: adamziel

wasm-build/php/Dockerfile

@@ -1,8 +1,11 @@
 FROM trzeci/emscripten:1.39.18-fastcomp
 SHELL ["/bin/bash", "-c"]
+ARG VRZNO_FLAG="--disable-vrzno"
+ENV VRZNO_FLAG ${VRZNO_FLAG}
+ARG PHP_VERSION=8.0.24
+ENV PHP_VERSION ${PHP_VERSION}
 
 WORKDIR /root
-COPY ./docker-build-files/* /root/
 RUN mkdir lib
 
 RUN set -euxo pipefail;\
@@ -31,29 +34,31 @@ ENV INITIAL_MEMORY 1024MB
 ENV EMCC_ALLOW_FASTCOMP   1
 ENV TIMER "(which pv > /dev/null && pv --name '${@}' || cat)"
 
-# Get and patch PHP 7.0.30
-RUN git clone https://github.com/php/php-src.git php7.4-src \
-    --branch PHP-7.4.30   \
+# Get and patch PHP
+COPY ./docker-build-files/php7.4.patch /root/
+RUN git clone https://github.com/php/php-src.git php-src \
+    --branch PHP-$PHP_VERSION   \
     --single-branch          \
     --depth 1 \
     && git apply --no-index /root/php7.4.patch \
-    && mkdir -p php7.4-src/preload/Zend \
-    && cp php7.4-src/Zend/bench.php php7.4-src/preload/Zend \
-    && touch php7.4-src/patched
+    && mkdir -p php-src/preload/Zend \
+    && cp php-src/Zend/bench.php php-src/preload/Zend \
+    && touch php-src/patched
 
 
 # Get and patch Sqlite3
+COPY ./docker-build-files/sqlite3-wasm.patch /root/
 RUN set -euxo pipefail;\
     wget --no-check-certificate https://sqlite.org/2020/sqlite-amalgamation-3330000.zip; \
     unzip sqlite-amalgamation-3330000.zip; \
     rm sqlite-amalgamation-3330000.zip; \
     mv sqlite-amalgamation-3330000 sqlite3.33-src; \
     git apply --no-index /root/sqlite3-wasm.patch; \
-    cp -v sqlite3.33-src/sqlite3.h php7.4-src/main/sqlite3.h; \
-    cp -v sqlite3.33-src/sqlite3.c php7.4-src/main/sqlite3.c;
+    cp -v sqlite3.33-src/sqlite3.h php-src/main/sqlite3.h; \
+    cp -v sqlite3.33-src/sqlite3.c php-src/main/sqlite3.c;
 
 # Get VRZNO
-RUN git clone https://github.com/seanmorris/vrzno.git php7.4-src/ext/vrzno \
+RUN git clone https://github.com/seanmorris/vrzno.git php-src/ext/vrzno \
     --branch DomAccess \
     --single-branch          \
     --depth 1
@@ -70,11 +75,11 @@ RUN cd libxml2 && emmake make
 RUN cd libxml2 && emmake make install
 
 # Build the patched PHP
-RUN cd php7.4-src/ && PKG_CONFIG_PATH=$PKG_CONFIG_PATH ./buildconf --force
+RUN cd php-src/ && PKG_CONFIG_PATH=$PKG_CONFIG_PATH ./buildconf --force
 
 # RUN ls /root/lib/lib/; sleep 50
 
-RUN cd php7.4-src/ && PKG_CONFIG_PATH=$PKG_CONFIG_PATH emconfigure ./configure \
+RUN cd php-src/ && PKG_CONFIG_PATH=$PKG_CONFIG_PATH emconfigure ./configure \
     PKG_CONFIG_PATH=$PKG_CONFIG_PATH \
     --enable-embed=static \
     --with-layout=GNU  \
@@ -100,20 +105,28 @@ RUN cd php7.4-src/ && PKG_CONFIG_PATH=$PKG_CONFIG_PATH emconfigure ./configure \
     --enable-mbstring  \
     --disable-mbregex  \
     --enable-tokenizer \
-    --enable-vrzno     \
+    $VRZNO_FLAG     \
     --enable-xml       \
     --enable-simplexml \
     --with-gd
 
-RUN cd php7.4-src/ && emmake make -j8
+RUN cd php-src/ && emmake make -j8
 
-RUN cp -v php7.4-src/.libs/libphp7.la php7.4-src/.libs/libphp7.a /root/lib/
+RUN cp -v php-src/.libs/libphp.la /root/lib/libphp7.la
+RUN cp -v php-src/.libs/libphp.a /root/lib//libphp7.a
 
-RUN cd php7.4-src/ && emcc -O3 \
+COPY ./docker-build-files/pib_eval.c /root/
+RUN if [ "$VRZNO_FLAG" = "--enable-vrzno" ]; \
+    then export DEFINES='-DWITH_VRZNO=1'; \
+    else export DEFINES=''; \
+    fi && \
+    cd php-src/ && \
+    emcc -O3 \
     -I .     \
     -I Zend  \
     -I main  \
     -I TSRM/ \
     -I /root/libxml2 \
+    $DEFINES \
     /root/pib_eval.c \
     -o /root/lib/pib_eval.o;

wasm-build/php/docker-build-files/php7.4-sqlite.patch

@@ -1,6 +1,6 @@
-diff --git a/php7.4-src/ext/pdo/config.m4 b/php7.4-src/ext/pdo/config.m4
---- a/php7.4-src/ext/pdo/config.m4
-+++ b/php7.4-src/ext/pdo/config.m4
+diff --git a/php-src/ext/pdo/config.m4 b/php-src/ext/pdo/config.m4
+--- a/php-src/ext/pdo/config.m4
++++ b/php-src/ext/pdo/config.m4
 @@ -4,15 +4,14 @@ PHP_ARG_ENABLE([pdo],
      [Disable PHP Data Objects support])],
    [yes])
@@ -21,10 +21,10 @@ diff --git a/php7.4-src/ext/pdo/config.m4 b/php7.4-src/ext/pdo/config.m4
 -  dnl so we always include the known-good working hack.
    PHP_ADD_MAKEFILE_FRAGMENT
  fi
-diff --git a/php7.4-src/ext/pdo_sqlite/config.m4 b/php7.4-src/ext/pdo_sqlite/config.m4
+diff --git a/php-src/ext/pdo_sqlite/config.m4 b/php-src/ext/pdo_sqlite/config.m4
 index fbb3d05c..42a8fd47 100644
---- a/php7.4-src/ext/pdo_sqlite/config.m4
-+++ b/php7.4-src/ext/pdo_sqlite/config.m4
+--- a/php-src/ext/pdo_sqlite/config.m4
++++ b/php-src/ext/pdo_sqlite/config.m4
 @@ -10,25 +10,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then
      AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.])
    fi
@@ -52,9 +52,9 @@ index fbb3d05c..42a8fd47 100644
 +   $ext_shared,,-I$pdo_cv_inc_path)
    PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo)
  fi
-diff --git a/php7.4-src/ext/pdo_sqlite/pdo_sqlite.c b/php7.4-src/ext/pdo_sqlite/pdo_sqlite.c
---- a/php7.4-src/ext/pdo_sqlite/pdo_sqlite.c
-+++ b/php7.4-src/ext/pdo_sqlite/pdo_sqlite.c
+diff --git a/php-src/ext/pdo_sqlite/pdo_sqlite.c b/php-src/ext/pdo_sqlite/pdo_sqlite.c
+--- a/php-src/ext/pdo_sqlite/pdo_sqlite.c
++++ b/php-src/ext/pdo_sqlite/pdo_sqlite.c
 @@ -23,8 +23,8 @@
  #include "php.h"
  #include "php_ini.h"
@@ -66,10 +66,10 @@ diff --git a/php7.4-src/ext/pdo_sqlite/pdo_sqlite.c b/php7.4-src/ext/pdo_sqlite/
  #include "php_pdo_sqlite.h"
  #include "php_pdo_sqlite_int.h"
  #include "zend_exceptions.h"
-diff --git a/php7.4-src/ext/pdo_sqlite/sqlite_driver.c b/php7.4-src/ext/pdo_sqlite/sqlite_driver.c
+diff --git a/php-src/ext/pdo_sqlite/sqlite_driver.c b/php-src/ext/pdo_sqlite/sqlite_driver.c
 index 83ea2d60..7265bfc7 100644
---- a/php7.4-src/ext/pdo_sqlite/sqlite_driver.c
-+++ b/php7.4-src/ext/pdo_sqlite/sqlite_driver.c
+--- a/php-src/ext/pdo_sqlite/sqlite_driver.c
++++ b/php-src/ext/pdo_sqlite/sqlite_driver.c
 @@ -23,8 +23,8 @@
  #include "php.h"
  #include "php_ini.h"
@@ -81,9 +81,9 @@ index 83ea2d60..7265bfc7 100644
  #include "php_pdo_sqlite.h"
  #include "php_pdo_sqlite_int.h"
  #include "zend_exceptions.h"
-diff --git a/php7.4-src/ext/pdo_sqlite/sqlite_statement.c b/php7.4-src/ext/pdo_sqlite/sqlite_statement.c
---- a/php7.4-src/ext/pdo_sqlite/sqlite_statement.c
-+++ b/php7.4-src/ext/pdo_sqlite/sqlite_statement.c
+diff --git a/php-src/ext/pdo_sqlite/sqlite_statement.c b/php-src/ext/pdo_sqlite/sqlite_statement.c
+--- a/php-src/ext/pdo_sqlite/sqlite_statement.c
++++ b/php-src/ext/pdo_sqlite/sqlite_statement.c
 @@ -23,8 +23,8 @@
  #include "php.h"
  #include "php_ini.h"
@@ -95,9 +95,9 @@ diff --git a/php7.4-src/ext/pdo_sqlite/sqlite_statement.c b/php7.4-src/ext/pdo_s
  #include "php_pdo_sqlite.h"
  #include "php_pdo_sqlite_int.h"
 
-diff --git a/php7.4-src/ext/sqlite3/config0.m4 b/php7.4-src/ext/sqlite3/config0.m4
---- a/php7.4-src/ext/sqlite3/config0.m4
-+++ b/php7.4-src/ext/sqlite3/config0.m4
+diff --git a/php-src/ext/sqlite3/config0.m4 b/php-src/ext/sqlite3/config0.m4
+--- a/php-src/ext/sqlite3/config0.m4
++++ b/php-src/ext/sqlite3/config0.m4
 @@ -5,26 +5,6 @@ PHP_ARG_WITH([sqlite3],
    [yes])
 

wasm-build/php/docker-build-files/php7.4.patch

@@ -1,6 +1,6 @@
-diff --git a/php7.4-src/ext/pdo/config.m4 b/php7.4-src/ext/pdo/config.m4
---- a/php7.4-src/ext/pdo/config.m4
-+++ b/php7.4-src/ext/pdo/config.m4
+diff --git a/php-src/ext/pdo/config.m4 b/php-src/ext/pdo/config.m4
+--- a/php-src/ext/pdo/config.m4
++++ b/php-src/ext/pdo/config.m4
 @@ -4,15 +4,14 @@ PHP_ARG_ENABLE([pdo],
      [Disable PHP Data Objects support])],
    [yes])
@@ -21,9 +21,9 @@ diff --git a/php7.4-src/ext/pdo/config.m4 b/php7.4-src/ext/pdo/config.m4
 -  dnl so we always include the known-good working hack.
    PHP_ADD_MAKEFILE_FRAGMENT
  fi
-diff --git a/php7.4-src/ext/pdo_sqlite/config.m4 b/php7.4-src/ext/pdo_sqlite/config.m4
---- a/php7.4-src/ext/pdo_sqlite/config.m4
-+++ b/php7.4-src/ext/pdo_sqlite/config.m4
+diff --git a/php-src/ext/pdo_sqlite/config.m4 b/php-src/ext/pdo_sqlite/config.m4
+--- a/php-src/ext/pdo_sqlite/config.m4
++++ b/php-src/ext/pdo_sqlite/config.m4
 @@ -10,25 +10,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then
      AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.])
    fi
@@ -51,9 +51,9 @@ diff --git a/php7.4-src/ext/pdo_sqlite/config.m4 b/php7.4-src/ext/pdo_sqlite/con
 +   $ext_shared,,-I$pdo_cv_inc_path)
    PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo)
  fi
-diff --git a/php7.4-src/ext/pdo_sqlite/pdo_sqlite.c b/php7.4-src/ext/pdo_sqlite/pdo_sqlite.c
---- a/php7.4-src/ext/pdo_sqlite/pdo_sqlite.c
-+++ b/php7.4-src/ext/pdo_sqlite/pdo_sqlite.c
+diff --git a/php-src/ext/pdo_sqlite/pdo_sqlite.c b/php-src/ext/pdo_sqlite/pdo_sqlite.c
+--- a/php-src/ext/pdo_sqlite/pdo_sqlite.c
++++ b/php-src/ext/pdo_sqlite/pdo_sqlite.c
 @@ -23,8 +23,8 @@
  #include "php.h"
  #include "php_ini.h"
@@ -65,9 +65,9 @@ diff --git a/php7.4-src/ext/pdo_sqlite/pdo_sqlite.c b/php7.4-src/ext/pdo_sqlite/
  #include "php_pdo_sqlite.h"
  #include "php_pdo_sqlite_int.h"
  #include "zend_exceptions.h"
-diff --git a/php7.4-src/ext/pdo_sqlite/sqlite_driver.c b/php7.4-src/ext/pdo_sqlite/sqlite_driver.c
---- a/php7.4-src/ext/pdo_sqlite/sqlite_driver.c
-+++ b/php7.4-src/ext/pdo_sqlite/sqlite_driver.c
+diff --git a/php-src/ext/pdo_sqlite/sqlite_driver.c b/php-src/ext/pdo_sqlite/sqlite_driver.c
+--- a/php-src/ext/pdo_sqlite/sqlite_driver.c
++++ b/php-src/ext/pdo_sqlite/sqlite_driver.c
 @@ -23,8 +23,8 @@
  #include "php.h"
  #include "php_ini.h"
@@ -79,9 +79,9 @@ diff --git a/php7.4-src/ext/pdo_sqlite/sqlite_driver.c b/php7.4-src/ext/pdo_sqli
  #include "php_pdo_sqlite.h"
  #include "php_pdo_sqlite_int.h"
  #include "zend_exceptions.h"
-diff --git a/php7.4-src/ext/pdo_sqlite/sqlite_statement.c b/php7.4-src/ext/pdo_sqlite/sqlite_statement.c
---- a/php7.4-src/ext/pdo_sqlite/sqlite_statement.c
-+++ b/php7.4-src/ext/pdo_sqlite/sqlite_statement.c
+diff --git a/php-src/ext/pdo_sqlite/sqlite_statement.c b/php-src/ext/pdo_sqlite/sqlite_statement.c
+--- a/php-src/ext/pdo_sqlite/sqlite_statement.c
++++ b/php-src/ext/pdo_sqlite/sqlite_statement.c
 @@ -23,8 +23,8 @@
  #include "php.h"
  #include "php_ini.h"
@@ -93,9 +93,9 @@ diff --git a/php7.4-src/ext/pdo_sqlite/sqlite_statement.c b/php7.4-src/ext/pdo_s
  #include "php_pdo_sqlite.h"
  #include "php_pdo_sqlite_int.h"
 
-diff --git a/php7.4-src/ext/sqlite3/config0.m4 b/php7.4-src/ext/sqlite3/config0.m4
---- a/php7.4-src/ext/sqlite3/config0.m4
-+++ b/php7.4-src/ext/sqlite3/config0.m4
+diff --git a/php-src/ext/sqlite3/config0.m4 b/php-src/ext/sqlite3/config0.m4
+--- a/php-src/ext/sqlite3/config0.m4
++++ b/php-src/ext/sqlite3/config0.m4
 @@ -5,26 +5,6 @@ PHP_ARG_WITH([sqlite3],
    [yes])
 
@@ -123,9 +123,9 @@ diff --git a/php7.4-src/ext/sqlite3/config0.m4 b/php7.4-src/ext/sqlite3/config0.
    PHP_NEW_EXTENSION(sqlite3, sqlite3.c, $ext_shared,,-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
    PHP_SUBST(SQLITE3_SHARED_LIBADD)
  fi
-diff --git a/php7.4-src/sapi/embed/php_embed.c b/php7.4-src/sapi/embed/php_embed.c
---- a/php7.4-src/sapi/embed/php_embed.c
-+++ b/php7.4-src/sapi/embed/php_embed.c
+diff --git a/php-src/sapi/embed/php_embed.c b/php-src/sapi/embed/php_embed.c
+--- a/php-src/sapi/embed/php_embed.c
++++ b/php-src/sapi/embed/php_embed.c
 @@ -211,8 +211,8 @@ EMBED_SAPI_API int php_embed_init(int argc, char **argv)
  	  return FAILURE;
    }

wasm-build/php/docker-build-files/pib_eval.c

@@ -6,8 +6,6 @@
 #include "zend_exceptions.h"
 #include "zend_closures.h"
 
-#include "../php7.4-src/ext/vrzno/php_vrzno.h"
-
 #include "sqlite3.h"
 #include "sqlite3.c"
 
@@ -99,6 +97,9 @@ int EMSCRIPTEN_KEEPALIVE pib_refresh()
 	return pib_init();
 }
 
+#ifdef WITH_VRZNO
+#include "../php-src/ext/vrzno/php_vrzno.h"
+
 int EMSCRIPTEN_KEEPALIVE exec_callback(zend_function *fptr)
 {
 	int retVal = vrzno_exec_callback(fptr);
@@ -112,3 +113,4 @@ int EMSCRIPTEN_KEEPALIVE del_callback(zend_function *fptr)
 {
 	return vrzno_del_callback(fptr);
 }
+#endif

wasm-build/php/node-build-wasm.sh

@@ -1,6 +1,20 @@
 #!/bin/bash
 
-docker build . --tag=wasm-wordpress-php-builder
+set -e
+
+PHP_VERSION=${1:-8.0.24}
+if [[ $PHP_VERSION == "7.*" ]]
+then
+  VRZNO_FLAG="--enable-vrzno"
+  EXTRA_EXPORTED_FUNCTIONS=', "_exec_callback", "_del_callback"'
+else
+  VRZNO_FLAG="--disable-vrzno"
+  EXTRA_EXPORTED_FUNCTIONS=""
+fi
+
+EXPORTED_FUNCTIONS='["_pib_init", "_pib_destroy", "_pib_run", "_pib_exec" "_pib_refresh", "_main", "_php_embed_init", "_php_embed_shutdown", "_php_embed_shutdown", "_zend_eval_string" '$EXTRA_EXPORTED_FUNCTIONS']'
+
+docker build . --tag=wasm-wordpress-php-builder --build-arg PHP_VERSION=$PHP_VERSION --build-arg VRZNO_FLAG="$VRZNO_FLAG"
 
 docker run \
         -v `pwd`/preload:/preload \
@@ -9,7 +23,7 @@ docker run \
         emcc -O3 \
         -o /output/node-php.js \
         --llvm-lto 2                     \
-        -s EXPORTED_FUNCTIONS='["_pib_init", "_pib_destroy", "_pib_run", "_pib_exec" "_pib_refresh", "_main", "_php_embed_init", "_php_embed_shutdown", "_php_embed_shutdown", "_zend_eval_string", "_exec_callback", "_del_callback"]' \
+        -s EXPORTED_FUNCTIONS="$EXPORTED_FUNCTIONS" \
         -s EXTRA_EXPORTED_RUNTIME_METHODS='["ccall", "UTF8ToString", "lengthBytesUTF8"]' \
         -s MAXIMUM_MEMORY=-1             \
         -s INITIAL_MEMORY=1024MB \

wasm-build/php/webworker-build-wasm.sh

@@ -1,6 +1,20 @@
 #!/bin/bash
 
-docker build . --tag=wasm-wordpress-php-builder
+set -e
+
+PHP_VERSION=${1:-8.0.24}
+if [[ $PHP_VERSION == "7.*" ]]
+then
+  VRZNO_FLAG="--enable-vrzno"
+  EXTRA_EXPORTED_FUNCTIONS=', "_exec_callback", "_del_callback"'
+else
+  VRZNO_FLAG="--disable-vrzno"
+  EXTRA_EXPORTED_FUNCTIONS=""
+fi
+
+EXPORTED_FUNCTIONS='["_pib_init", "_pib_destroy", "_pib_run", "_pib_exec" "_pib_refresh", "_main", "_php_embed_init", "_php_embed_shutdown", "_php_embed_shutdown", "_zend_eval_string" '$EXTRA_EXPORTED_FUNCTIONS']'
+
+docker build . --tag=wasm-wordpress-php-builder --build-arg PHP_VERSION=$PHP_VERSION --build-arg VRZNO_FLAG="$VRZNO_FLAG"
 
 docker run \
         -v `pwd`/preload:/preload \
@@ -9,7 +23,7 @@ docker run \
         emcc -O3 \
         -o /output/webworker-php.js \
         --llvm-lto 2                     \
-        -s EXPORTED_FUNCTIONS='["_pib_init", "_pib_destroy", "_pib_run", "_pib_exec" "_pib_refresh", "_main", "_php_embed_init", "_php_embed_shutdown", "_php_embed_shutdown", "_zend_eval_string", "_exec_callback", "_del_callback"]' \
+        -s EXPORTED_FUNCTIONS="$EXPORTED_FUNCTIONS" \
         -s EXTRA_EXPORTED_RUNTIME_METHODS='["ccall", "UTF8ToString", "lengthBytesUTF8", "FS", "PROXYFS"]' \
         -s MAXIMUM_MEMORY=-1             \
         -s INITIAL_MEMORY=1024MB \