From f75cdda6e0cda2bfd8e85d063132a9333469e174 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 20 Aug 2023 08:00:00 +0200 Subject: update to 1.57.0 build out of sources tree --- PHPINFO | 2 +- REFLECTION | 4 ++-- grpc-noatfork.patch | 2 +- php-pecl-grpc.spec | 50 +++++++++++++++++++++++++------------------------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/PHPINFO b/PHPINFO index 6ba05ad..c52a768 100644 --- a/PHPINFO +++ b/PHPINFO @@ -2,7 +2,7 @@ grpc grpc support => enabled -grpc module version => 1.56.0 +grpc module version => 1.57.0 Directive => Local Value => Master Value grpc.enable_fork_support => 0 => 0 diff --git a/REFLECTION b/REFLECTION index e5d199e..12678a4 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #123 grpc version 1.56.0 ] { +Extension [ extension #125 grpc version 1.57.0 ] { - INI { Entry [ grpc.enable_fork_support ] @@ -60,7 +60,7 @@ Extension [ extension #123 grpc version 1.56.0 ] { Constant [ int Grpc\CHANNEL_READY ] { 2 } Constant [ int Grpc\CHANNEL_TRANSIENT_FAILURE ] { 3 } Constant [ int Grpc\CHANNEL_FATAL_FAILURE ] { 4 } - Constant [ string Grpc\VERSION ] { 1.56.0 } + Constant [ string Grpc\VERSION ] { 1.57.0 } } - Classes [7] { diff --git a/grpc-noatfork.patch b/grpc-noatfork.patch index f05b8e2..5029d96 100644 --- a/grpc-noatfork.patch +++ b/grpc-noatfork.patch @@ -7,5 +7,5 @@ diff -up ./config.m4.noatfork ./config.m4 -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0 \ - -DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1 \ -DGRPC_XDS_USER_AGENT_NAME_SUFFIX='"\"PHP\""' \ - -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.56.0\""') + -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.57.0\""') diff --git a/php-pecl-grpc.spec b/php-pecl-grpc.spec index c043df9..1438de5 100644 --- a/php-pecl-grpc.spec +++ b/php-pecl-grpc.spec @@ -7,20 +7,17 @@ # Please, preserve the changelog entries # -# we don't want -z defs linker flag -%undefine _strict_symbol_defs_build - -%if 0%{?scl:1} -%scl_package php-pecl-grpc -%endif +%{?scl:%scl_package php-pecl-grpc} ## TODO: not suitable for Fedora, tons of bundled libraries -%global pecl_name grpc -%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%global ini_name 40-%{pecl_name}.ini -%global upstream_version 1.56.0 +%global pecl_name grpc +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} +%global ini_name 40-%{pecl_name}.ini +%global upstream_version 1.57.0 #global upstream_prever RC1 +%global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} +%global _configure ../%{sources}/configure Summary: General RPC framework Name: %{?scl_prefix}php-pecl-%{pecl_name} @@ -28,7 +25,7 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: Apache-2.0 URL: https://pecl.php.net/package/%{pecl_name} -Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz +Source0: https://pecl.php.net/get/%{sources}.tgz Patch0: %{pecl_name}-build.patch Patch1: %{pecl_name}-noatfork.patch @@ -48,7 +45,6 @@ BuildRequires: zlib-devel Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} -%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} Provides: %{?scl_prefix}php-%{pecl_name} = %{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} @@ -68,14 +64,13 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -q -c -mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS # Don't install/register tests sed -e 's/role="test"/role="src"/' \ %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ -i package.xml -cd NTS +cd %{sources} %patch -P0 -p1 -b .rpm %ifarch %{arm} %patch -P1 -p1 -b .noatfork @@ -91,9 +86,9 @@ if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then fi cd .. +mkdir NTS %if %{with_zts} -# Duplicate source tree for NTS / ZTS build -cp -pr NTS ZTS +mkdir ZTS %endif # Create configuration file @@ -113,22 +108,23 @@ EOF %build %{?dtsenable} -cd NTS -%{_bindir}/phpize +cd %{sources} +%{__phpize} + +cd ../NTS %configure \ --enable-grpc \ --with-libdir=%{_lib} \ - --with-php-config=%{_bindir}/php-config + --with-php-config=%{__phpconfig} make %{?_smp_mflags} %if %{with_zts} cd ../ZTS -%{_bindir}/zts-phpize %configure \ --enable-grpc \ --with-libdir=%{_lib} \ - --with-php-config=%{_bindir}/zts-php-config + --with-php-config=%{__ztsphpconfig} make %{?_smp_mflags} %endif @@ -153,7 +149,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} # Documentation for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i +do install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done @@ -182,20 +178,20 @@ fi cd NTS %{__php} --no-php-ini \ --define extension=modules/%{pecl_name}.so \ - --modules | grep %{pecl_name} + --modules | grep '^%{pecl_name}$' %if %{with_zts} : Minimal load test for ZTS extension cd ../ZTS %{__ztsphp} --no-php-ini \ --define extension=modules/%{pecl_name}.so \ - --modules | grep %{pecl_name} + --modules | grep '^%{pecl_name}$' %endif %files %{!?_licensedir:%global license %%doc} -%license NTS/LICENSE +%license %{sources}/LICENSE %{pecl_xmldir}/%{name}.xml %config(noreplace) %{php_inidir}/%{ini_name} @@ -208,6 +204,10 @@ cd ../ZTS %changelog +* Sat Aug 19 2023 Remi Collet - 1.57.0-1 +- update to 1.57.0 +- build out of sources tree + * Mon Jun 19 2023 Remi Collet - 1.56.0-1 - update to 1.56.0 -- cgit