wip: add buildconf

colopl · Aug 9, 2024 · 8488742 · 8488742
1 parent 6763dff
commit 8488742
Showing 1 changed file with 45 additions and 36 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,12 +12,13 @@ ENV PSKEL_SKIP_DEBUG=${PSKEL_SKIP_DEBUG}
 ENV PSKEL_EXTRA_CONFIGURE_OPTIONS=${PSKEL_EXTRA_CONFIGURE_OPTIONS}
 
 RUN if test -f "/etc/debian_version"; then \
-      apt-get update && \
-      DEBIAN_FRONTEND="noninteractive" apt-get install -y \
-        "build-essential" "bison" "valgrind" "llvm" "clang" "zlib1g-dev" "libsqlite3-dev" "git" && \
+      apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y "git" && \
       if test "${PSKEL_SKIP_DEBUG}" = ""; then \
+	    apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y "build-essential" "bison" "zlib1g-dev" "libsqlite3-dev" && \
+		apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y "valgrind" && \
         docker-php-source extract && \
         cd "/usr/src/php" && \
+		  ./buildconf --force && \
           CFLAGS="-fpic -fpie -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-pie" ./configure --disable-all \
               --includedir="/usr/local/include/gcc-valgrind-php" --program-prefix="gcc-valgrind-" \
               --disable-cgi --disable-fpm --enable-cli \
@@ -32,26 +33,28 @@ RUN if test -f "/etc/debian_version"; then \
         docker-php-source delete && \
         docker-php-source extract && \
         cd "/usr/src/php" && \
-          CC=clang CXX=clang++ CFLAGS="-fsanitize=memory -fno-sanitize-recover -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=memory" ./configure \
-              --includedir="/usr/local/include/clang-msan-php" --program-prefix="clang-msan-" \
-              --disable-cgi --disable-all --disable-fpm --enable-cli \
+		  ./buildconf --force && \
+          CFLAGS="-fpic -fpie -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-pie" ./configure --disable-all \
+              --includedir="/usr/local/include/debug-php" --program-prefix="debug-" \
+              --disable-cgi --disable-fpm --enable-cli \
               --enable-mysqlnd --enable-pdo --with-pdo-mysql --with-pdo-sqlite \
-              --enable-debug --without-pcre-jit "$(php -r "echo PHP_ZTS === 1 ? '--enable-zts' : '';")" \
-              --enable-memory-sanitizer \
+              --enable-debug "$(php -r "echo PHP_ZTS === 1 ? '--enable-zts' : '';")" \
               ${PSKEL_EXTRA_CONFIGURE_OPTIONS} \
               --enable-option-checking=fatal && \
           make -j$(nproc) && \
           make install && \
         cd - && \
         docker-php-source delete && \
+		apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y "llvm" "clang" && \
         docker-php-source extract && \
         cd "/usr/src/php" && \
-          CC=clang CXX=clang++ CFLAGS="-fsanitize=address -fno-sanitize-recover -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=address" ./configure \
-              --includedir="/usr/local/include/clang-asan-php" --program-prefix="clang-asan-" \
+		  ./buildconf --force && \
+          CC="clang" CXX="clang++" CFLAGS="-fsanitize=memory -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=memory" ./configure \
+              --includedir="/usr/local/include/clang-msan-php" --program-prefix="clang-msan-" \
               --disable-cgi --disable-all --disable-fpm --enable-cli \
               --enable-mysqlnd --enable-pdo --with-pdo-mysql --with-pdo-sqlite \
               --enable-debug --without-pcre-jit "$(php -r "echo PHP_ZTS === 1 ? '--enable-zts' : '';")" \
-              --enable-address-sanitizer \
+              --enable-memory-sanitizer \
               ${PSKEL_EXTRA_CONFIGURE_OPTIONS} \
               --enable-option-checking=fatal && \
           make -j$(nproc) && \
@@ -60,12 +63,13 @@ RUN if test -f "/etc/debian_version"; then \
         docker-php-source delete && \
         docker-php-source extract && \
         cd "/usr/src/php" && \
-          CC=clang CXX=clang++ CFLAGS="-fsanitize=undefined -fno-sanitize-recover -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined" ./configure \
-              --includedir="/usr/local/include/clang-ubsan-php" --program-prefix="clang-ubsan-" \
+		  ./buildconf --force && \
+          CC="clang" CXX="clang++" CFLAGS="-fsanitize=address -fno-sanitize-recover -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=address" ./configure \
+              --includedir="/usr/local/include/clang-asan-php" --program-prefix="clang-asan-" \
               --disable-cgi --disable-all --disable-fpm --enable-cli \
               --enable-mysqlnd --enable-pdo --with-pdo-mysql --with-pdo-sqlite \
               --enable-debug --without-pcre-jit "$(php -r "echo PHP_ZTS === 1 ? '--enable-zts' : '';")" \
-              --enable-undefined-sanitizer \
+              --enable-address-sanitizer \
               ${PSKEL_EXTRA_CONFIGURE_OPTIONS} \
               --enable-option-checking=fatal && \
           make -j$(nproc) && \
@@ -74,11 +78,13 @@ RUN if test -f "/etc/debian_version"; then \
         docker-php-source delete && \
         docker-php-source extract && \
         cd "/usr/src/php" && \
-          CFLAGS="-fpic -fpie -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-pie" ./configure --disable-all \
-              --includedir="/usr/local/include/debug-php" --program-prefix="debug-" \
-              --disable-cgi --disable-fpm --enable-cli \
+		  ./buildconf --force && \
+          CC="clang" CXX="clang++" CFLAGS="-fsanitize=undefined -fno-sanitize-recover -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined" ./configure \
+              --includedir="/usr/local/include/clang-ubsan-php" --program-prefix="clang-ubsan-" \
+              --disable-cgi --disable-all --disable-fpm --enable-cli \
               --enable-mysqlnd --enable-pdo --with-pdo-mysql --with-pdo-sqlite \
-              --enable-debug "$(php -r "echo PHP_ZTS === 1 ? '--enable-zts' : '';")" \
+              --enable-debug --without-pcre-jit "$(php -r "echo PHP_ZTS === 1 ? '--enable-zts' : '';")" \
+              --enable-undefined-sanitizer \
               ${PSKEL_EXTRA_CONFIGURE_OPTIONS} \
               --enable-option-checking=fatal && \
           make -j$(nproc) && \
@@ -87,33 +93,36 @@ RUN if test -f "/etc/debian_version"; then \
         docker-php-source delete; \
       fi; \
     elif test -f "/etc/alpine-release"; then \
-        apk add --no-cache ${PHPIZE_DEPS} "bison" "valgrind" "valgrind-dev" "zlib-dev" "sqlite-dev" "git" && \
+        apk add --no-cache ${PHPIZE_DEPS} "git" && \
         if test "${PSKEL_SKIP_DEBUG}" = ""; then \
+		  apk add --no-cache "bison" "valgrind" "valgrind-dev" "zlib-dev" "sqlite-dev" && \
           docker-php-source extract && \
           cd "/usr/src/php" && \
-              CFLAGS="-fpic -fpie -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-pie" ./configure --disable-all \
-                  --includedir="/usr/local/include/gcc-valgrind-php" --program-prefix="gcc-valgrind-" \
-                  --disable-cgi --disable-fpm --enable-cli \
-                  --enable-mysqlnd --enable-pdo --with-pdo-mysql --with-pdo-sqlite \
-                  --enable-debug --without-pcre-jit "$(php -r "echo PHP_ZTS === 1 ? '--enable-zts' : '';")" \
-                  --with-valgrind \
-                  ${PSKEL_EXTRA_CONFIGURE_OPTIONS} \
-                  --enable-option-checking=fatal && \
+		    ./buildconf --force && \
+            CFLAGS="-fpic -fpie -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-pie" ./configure --disable-all \
+                --includedir="/usr/local/include/gcc-valgrind-php" --program-prefix="gcc-valgrind-" \
+                --disable-cgi --disable-fpm --enable-cli \
+                --enable-mysqlnd --enable-pdo --with-pdo-mysql --with-pdo-sqlite \
+                --enable-debug --without-pcre-jit "$(php -r "echo PHP_ZTS === 1 ? '--enable-zts' : '';")" \
+                --with-valgrind \
+                ${PSKEL_EXTRA_CONFIGURE_OPTIONS} \
+                --enable-option-checking=fatal && \
               make -j$(nproc) && \
               make install && \
           cd - && \
           docker-php-source delete && \
           docker-php-source extract && \
           cd "/usr/src/php" && \
-              CFLAGS="-fpic -fpie -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-pie" ./configure --disable-all \
-                  --includedir="/usr/local/include/debug-php" --program-prefix="debug-" \
-                  --disable-cgi --disable-fpm --enable-cli \
-                  --enable-mysqlnd --enable-pdo --with-pdo-mysql --with-pdo-sqlite \
-                  --enable-debug "$(php -r "echo PHP_ZTS === 1 ? '--enable-zts' : '';")" \
-                  ${PSKEL_EXTRA_CONFIGURE_OPTIONS} \
-                  --enable-option-checking=fatal && \
-              make -j$(nproc) && \
-              make install && \
+		    ./buildconf --force && \
+            CFLAGS="-fpic -fpie -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-pie" ./configure --disable-all \
+                --includedir="/usr/local/include/debug-php" --program-prefix="debug-" \
+                --disable-cgi --disable-fpm --enable-cli \
+                --enable-mysqlnd --enable-pdo --with-pdo-mysql --with-pdo-sqlite \
+                --enable-debug "$(php -r "echo PHP_ZTS === 1 ? '--enable-zts' : '';")" \
+                ${PSKEL_EXTRA_CONFIGURE_OPTIONS} \
+                --enable-option-checking=fatal && \
+            make -j$(nproc) && \
+            make install && \
           cd - && \
           docker-php-source delete; \
         fi; \