diff options
| author | Remi Collet <remi@remirepo.net> | 2023-02-17 13:10:56 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2023-02-17 13:10:56 +0100 |
| commit | 29bfa653bbd370b60e4666933d43b651b078831b (patch) | |
| tree | 1879fb6076c79e4ede86b2dad468bad9fedb05d4 /php-pecl-couchbase4.spec | |
| parent | 00337b2ce6935027f9632e3ea1852d46fc6fc651 (diff) | |
fix GCC 13 build using patch from
https://github.com/couchbase/couchbase-php-client/pull/63
Diffstat (limited to 'php-pecl-couchbase4.spec')
| -rw-r--r-- | php-pecl-couchbase4.spec | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/php-pecl-couchbase4.spec b/php-pecl-couchbase4.spec index 5877d79..ea5d7e6 100644 --- a/php-pecl-couchbase4.spec +++ b/php-pecl-couchbase4.spec @@ -27,7 +27,7 @@ Summary: Couchbase Server PHP extension Name: %{?scl_prefix}php-pecl-couchbase4 Version: 4.1.0 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} # Apache-2.0 # src # third_party/json/LICENSE.ryu @@ -50,6 +50,8 @@ License: Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause AND MIT URL: https://pecl.php.net/package/couchbase Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz +Patch0: %{pecl_name}-gcc13.patch + BuildRequires: make %if 0%{?rhel} == 7 BuildRequires: cmake3 >= 3.17 @@ -136,9 +138,12 @@ cp NTS/src/deps/couchbase-cxx-client/third_party/spdlog/LICENSE cp NTS/src/deps/couchbase-cxx-client/LICENSE.txt lic/LICENSE.txt cd NTS +%patch0 -p1 -b.gcc13 + %if 0%{?rhel} == 7 sed -e 's/cmake/cmake3/' -i config.m4 %endif +sed -e 's/--verbose/%{?_smp_mflags} --verbose/' -i Makefile.frag # Sanity check, really often broken extver=$(sed -n '/#define PHP_COUCHBASE_VERSION/{s/.* "//;s/".*$//;p}' src/php_couchbase.hxx) @@ -269,6 +274,10 @@ fi %changelog +* Fri Feb 17 2023 Remi Collet <remi@remirepo.net> - 4.1.0-2 +- fix GCC 13 build using patch from + https://github.com/couchbase/couchbase-php-client/pull/63 + * Mon Jan 23 2023 Remi Collet <remi@remirepo.net> - 4.1.0-1 - update to 4.1.0 - drop patch merged upstream |