From c5f11de8ddef54a313737ab455102855a11cbc98 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 27 May 2020 15:16:34 +0200 Subject: build phpdbg only once --- php-7.4.0-embed.patch | 2 +- php.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/php-7.4.0-embed.patch b/php-7.4.0-embed.patch index 1c743c2..f7a9aaa 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 litespeed fpm @PHP_INSTALLED_SAPIS@" ++php_sapis="apache2handler litespeed fpm phpdbg @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 063641f..701b417 100644 --- a/php.spec +++ b/php.spec @@ -97,7 +97,7 @@ %global with_zip 0 -%global gh_commit cf3b133a86e45fddf862d3d0dc579d51d661afa8 +%global gh_commit 0de3ca4f98cd79f747f92cd9fab2a72e85b3cd1f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_date 20200526 %global gh_owner php @@ -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: 13%{?dist} +Release: 14%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -1261,6 +1261,7 @@ popd without_shared="--disable-gd \ --disable-dom --disable-dba --without-unixODBC \ --disable-opcache \ + --disable-phpdbg \ --disable-json \ --without-ffi \ --disable-xmlreader --disable-xmlwriter \ @@ -1816,6 +1817,9 @@ fi %changelog +* Wed May 27 2020 Remi Collet - 8.0.0~DEV.20200526-14 +- new snapshot + * Tue May 26 2020 Remi Collet - 8.0.0~DEV.20200526-13 - new snapshot -- cgit