From 11f1753be147a5efd9eec2ec47fe4e9c7300141c Mon Sep 17 00:00:00 2001 From: Jelle Raaijmakers Date: Sat, 8 Jan 2022 00:12:42 +0100 Subject: [PATCH] Ports: Unset env vars after configure in `php` These environment variables would linger after the `php` port was done building. This would pose issues in the future if other ports depend on this package, since these vars then leak into the build scripts. --- Ports/php/package.sh | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/Ports/php/package.sh b/Ports/php/package.sh index 7b4bcc18b1..f217f2c56f 100755 --- a/Ports/php/package.sh +++ b/Ports/php/package.sh @@ -22,13 +22,28 @@ launcher_command="/usr/local/bin/php -a" launcher_run_in_terminal="true" icon_file="win32/build/php.ico" -export CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/libxml2" -export LIBS="-ldl" -export LIBXML_CFLAGS="y" -export LIBXML_LIBS="-lxml2" -export OPENSSL_CFLAGS="y" -export OPENSSL_LIBS="-lssl -lcrypto" -export SQLITE_CFLAGS="y" -export SQLITE_LIBS="-lsqlite3 -lpthread" -export ZLIB_CFLAGS="y" -export ZLIB_LIBS="-lz" +pre_configure() { + export CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/libxml2" + export LIBS="-ldl" + export LIBXML_CFLAGS="y" + export LIBXML_LIBS="-lxml2" + export OPENSSL_CFLAGS="y" + export OPENSSL_LIBS="-lssl -lcrypto" + export SQLITE_CFLAGS="y" + export SQLITE_LIBS="-lsqlite3 -lpthread" + export ZLIB_CFLAGS="y" + export ZLIB_LIBS="-lz" +} + +post_configure() { + unset ZLIB_LIBS + unset ZLIB_CFLAGS + unset SQLITE_LIBS + unset SQLITE_CFLAGS + unset OPENSSL_LIBS + unset OPENSSL_CFLAGS + unset LIBXML_LIBS + unset LIBS + unset LIBXML_CFLAGS + unset CFLAGS +}