From 83ae075f339e79651c348b18144681f3ff82234c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 20 May 2020 11:27:50 +0200 Subject: use php-config from embed SAPI to reduce used libs --- php-7.4.0-embed.patch | 2 +- php74.spec | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/php-7.4.0-embed.patch b/php-7.4.0-embed.patch index 1bfd1da..1c743c2 100644 --- a/php-7.4.0-embed.patch +++ b/php-7.4.0-embed.patch @@ -18,7 +18,7 @@ diff -up php-5.5.30/scripts/php-config.in.old php-5.5.30/scripts/php-config.in php_cgi_binary=NONE configure_options="@CONFIGURE_OPTIONS@" -php_sapis="@PHP_INSTALLED_SAPIS@" -+php_sapis="apache2handler embed fpm @PHP_INSTALLED_SAPIS@" ++php_sapis="apache2handler litespeed fpm @PHP_INSTALLED_SAPIS@" ini_dir="@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@" ini_path="@EXPANDED_PHP_CONFIG_FILE_PATH@" diff --git a/php74.spec b/php74.spec index 4c2d898..e6153ef 100644 --- a/php74.spec +++ b/php74.spec @@ -103,7 +103,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{lower}} -Release: 1%{?dist} +Release: 2%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -426,7 +426,6 @@ Requires: gcc-c++ Requires: libtool # see "php-config --libs" Requires: krb5-devel%{?_isa} -Requires: libedit-devel%{?_isa} Requires: libxml2-devel%{?_isa} Requires: openssl-devel%{?_isa} >= 1.0.1 %if %{with_libpcre} @@ -1674,6 +1673,9 @@ make -C build-fpm install-fpm \ make -C build-cgi install \ INSTALL_ROOT=$RPM_BUILD_ROOT +# Use php-config from embed SAPI to reduce used libs +install -m 755 build-embedded/scripts/php-config $RPM_BUILD_ROOT%{_bindir}/php-config + # Install the default configuration file install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/php.ini @@ -2159,6 +2161,9 @@ fi %changelog +* Wed May 20 2020 Remi Collet - 7.4.6-2 +- use php-config from embed SAPI to reduce used libs + * Tue May 12 2020 Remi Collet - 7.4.6-1 - Update to 7.4.6 - http://www.php.net/releases/7_4_6.php -- cgit