Skip to content

Commit 7da2707

Browse files
morrisonleviclaude
andcommitted
build: silence make recipe output in bookworm PHP builds
Adds -s (silent) to all make invocations in build-php.sh and to MAKEFLAGS in build-extensions.sh (which covers pecl installs too). Compiler errors still print via stderr; only the cc/ld recipe lines are suppressed. Reduces log volume significantly given parallel stages. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 09b85da commit 7da2707

3 files changed

Lines changed: 12 additions & 9 deletions

File tree

dockerfiles/ci/bookworm/build-extensions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PHP_ZTS=$(php -r 'echo PHP_ZTS;')
88
EXTENSION_DIR=$(php-config --extension-dir)
99

1010
# This make `pecl install` use all available cores
11-
export MAKEFLAGS="-j $(nproc)"
11+
export MAKEFLAGS="-s -j $(nproc)"
1212

1313
XDEBUG_VERSIONS=(-3.1.2)
1414
if [[ $PHP_VERSION_ID -le 70 ]]; then

dockerfiles/ci/bookworm/build-php.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@ ${PHP_SRC_DIR}/configure \
9191
--with-config-file-path=${INSTALL_DIR} \
9292
--with-config-file-scan-dir=${INSTALL_DIR}/conf.d
9393

94-
make -j "$((`nproc`+1))" || true
94+
make -s -j "$((`nproc`+1))" || true
9595

9696
if ! [[ -f ext/phar/phar.phar ]] && [[ ${INSTALL_VERSION} == *asan* ]]; then
9797
# Cross-compilation with asan and qemu will fail with a segfault instead. Handle this.
9898
sed -ir 's/TEST_PHP_EXECUTABLE_RES =.*/TEST_PHP_EXECUTABLE_RES = 1/' Makefile
9999
mkdir -p ext/phar/
100100
touch ext/phar/phar.phar
101101
# ensure compilation finishes, then back up php
102-
make || true;
102+
make -s || true;
103103
exit;
104104
fi
105105

@@ -109,7 +109,7 @@ if [[ ${INSTALL_VERSION} != *asan* ]]; then
109109
# In two steps, because: You've configured multiple SAPIs to be built. You can build only one SAPI module plus CGI, CLI and FPM binaries at the same time.
110110
sed -i 's/--enable-embed/--with-apxs2=\/usr\/bin\/apxs2/' config.nice
111111
./config.nice
112-
make -j "$((`nproc`+1))"
112+
make -s -j "$((`nproc`+1))"
113113
cp .libs/libphp*.so ${INSTALL_DIR}/lib/apache2handler-libphp.so
114114
fi
115115

dockerfiles/ci/bookworm/php-8.5/0001-Disable-preserve_none-under-ASan.patch

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@ in llvm-project (commit 996157c).
99

1010
See: https://github.com/llvm/llvm-project/issues/95928
1111
---
12-
Zend/zend_portability.h | 6 +++++-
13-
1 file changed, 5 insertions(+), 1 deletion(-)
12+
Zend/zend_portability.h | 7 ++++++-
13+
1 file changed, 6 insertions(+), 1 deletion(-)
1414

1515
diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h
16-
index 1111111..2222222 100644
16+
index 6546ebfb5b7..3b657f7b9d9 100644
1717
--- a/Zend/zend_portability.h
1818
+++ b/Zend/zend_portability.h
19-
@@ -333,7 +333,11 @@ static zend_always_inline double _zend_get_nan(void) /* {{{ */
20-
19+
@@ -333,7 +333,12 @@ char *alloca();
20+
#endif
21+
2122
#ifdef HAVE_PRESERVE_NONE
2223
-# define ZEND_PRESERVE_NONE __attribute__((preserve_none))
2324
+# if __has_feature(address_sanitizer) || defined(__SANITIZE_ADDRESS__)
@@ -27,3 +28,5 @@ index 1111111..2222222 100644
2728
+# define ZEND_PRESERVE_NONE __attribute__((preserve_none))
2829
+# endif
2930
#endif
31+
32+

0 commit comments

Comments
 (0)