From 4e623de8829f38800ad50c1e700e68da24b0ddae Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 20 May 2020 11:04:19 +0200
Subject: [PATCH] use php-config from embed SAPI to reduce used libs

---
 php-7.4.0-embed.patch | 2 +-
 php.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..e96a56f 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 fpm @PHP_INSTALLED_SAPIS@"
  ini_dir="@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@"
  ini_path="@EXPANDED_PHP_CONFIG_FILE_PATH@"
  
diff --git a/php.spec b/php.spec
index 6d24a9c..30a4002 100644
--- a/php.spec
+++ b/php.spec
@@ -60,7 +60,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 2%{?dist}
+Release: 3%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -286,7 +286,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
 Requires: pcre2-devel%{?_isa}
@@ -1146,6 +1145,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
@@ -1508,6 +1510,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 
 
 %changelog
+* Tue May 12 2020 Remi Collet <remi@remirepo.net> - 7.4.6-3
+- use php-config from embed SAPI to reduce used libs
+
 * Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 7.4.6-2
 - Rebuild for ICU 67