summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-05-20 11:27:42 +0200
committerRemi Collet <remi@remirepo.net>2020-05-20 11:27:42 +0200
commit0c6603c6f7790d09904e695e9d75155462f9ea26 (patch)
tree9011a22541f9fef33ad70b90389ea7f4bf9004b2
parentbe7b6a4819913ddd2176cd3a4448098021c9470f (diff)
use php-config from embed SAPI to reduce used libs
-rw-r--r--php-7.4.0-embed.patch2
-rw-r--r--php.spec9
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/php.spec b/php.spec
index dd3426b..6fc5d71 100644
--- a/php.spec
+++ b/php.spec
@@ -109,7 +109,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 11%{?dist}
+Release: 12%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -399,7 +399,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}
@@ -1348,6 +1347,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
@@ -1814,6 +1816,9 @@ fi
%changelog
+* Wed May 20 2020 Remi Collet <remi@remirepo.net> - 8.0.0~DEV.20200519-12
+- use php-config from embed SAPI to reduce used libs
+
* Tue May 19 2020 Remi Collet <remi@remirepo.net> - 8.0.0~DEV.20200519-11
- new snapshot