Improve build flags for extensions

Author: shivammathur

scripts/build.sh

@@ -46,19 +46,16 @@ get_buildflags() {
   echo "$flags"
 }
 
-# Function to build PHP.
-build_php() {
-  echo "::group::$1"
-  SAPI=$1
-
+# Function to configure flags
+configure_flags() {
   # Set and export FLAGS
   CFLAGS="$(get_buildflags CFLAGS "$lto") $(getconf LFS_CFLAGS)"  
   CFLAGS=$(echo "$CFLAGS" | sed -E 's/-Werror=implicit-function-declaration//g')
   CFLAGS="$CFLAGS -DOPENSSL_SUPPRESS_DEPRECATED"
 
   CPPFLAGS="$(get_buildflags CPPFLAGS "$lto")"
   CXXFLAGS="$(get_buildflags CXXFLAGS "$lto")"
-  LDFLAGS="$(get_buildflags LDFLAGS "$lto") -Wl,-z,now -Wl,--as-needed"
+  LDFLAGS="$(get_buildflags LDFLAGS "$lto") -Wl,--as-needed"
 
   if [[ "$PHP_VERSION" =~ 5.6|7.[0-4]|8.0 ]]; then
     EXTRA_CFLAGS="-fpermissive -Wno-deprecated -Wno-deprecated-declarations"
@@ -83,6 +80,14 @@ build_php() {
   export DEB_HOST_MULTIARCH
   export ICU_CXXFLAGS
   export SED
+}
+
+# Function to build PHP.
+build_php() {
+  echo "::group::$1"
+  SAPI=$1
+
+  configure_flags
 
   # Export inputs
   export INSTALL_ROOT

scripts/install-extension.sh

@@ -31,6 +31,9 @@ tar xf "/tmp/$extension.tar.gz" -C /tmp
     cd /tmp/"$(basename "$repo")"-"${tag/\//-}" || exit 1
   fi
   export SED=$(command -v sed)
+  ORIG_CFLAGS=$CFLAGS
+  ORIG_LDFLAGS=$LDFLAGS
+  configure_flags
   patch_"${extension}" 2>/dev/null || true
   phpize
   ./configure "--with-php-config=/usr/bin/php-config" "${params[@]}"
@@ -39,4 +42,6 @@ tar xf "/tmp/$extension.tar.gz" -C /tmp
   # shellcheck disable=SC2097
   # shellcheck disable=SC2098
   INSTALL_ROOT="$INSTALL_ROOT" make install DESTDIR="$INSTALL_ROOT"
+  export CFLAGS=$ORIG_CFLAGS
+  export LDFLAGS=$ORIG_LDFLAGS
 )

scripts/patch-extensions.sh

@@ -14,8 +14,8 @@ configure_imagick() {
     echo "MagickWand not found — install libmagickwand-dev" >&2
     exit 1
   fi
-  export CPPFLAGS="$(pkg-config --cflags "$PKG_WAND")"
-  export LDFLAGS="$(pkg-config --libs "$PKG_WAND")"
+  export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags "$PKG_WAND")"
+  export LDFLAGS="$LDFLAGS $(pkg-config --libs "$PKG_WAND")"
 }
 
 # Function to patch imagick source.