diff options
| author | Remi Collet <remi@remirepo.net> | 2023-02-17 09:50:05 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2023-02-17 09:50:05 +0100 |
| commit | d578e90a0dca62be35dc860edfd3e206bdb21adf (patch) | |
| tree | 7b9b4bf5f9c60127d79593a5edc91ecf747aba9c | |
| parent | 404f69deb283e127465e108141cd1814aee7ae04 (diff) | |
fix GCC 13 build using patch from
https://github.com/openswoole/ext-openswoole/pull/304
| -rw-r--r-- | openswoole-gcc13.patch | 21 | ||||
| -rw-r--r-- | php-pecl-openswoole22.spec | 14 |
2 files changed, 32 insertions, 3 deletions
diff --git a/openswoole-gcc13.patch b/openswoole-gcc13.patch new file mode 100644 index 0000000..ec7c379 --- /dev/null +++ b/openswoole-gcc13.patch @@ -0,0 +1,21 @@ +From de189ecb0c8ba3c1e1bab01e4f82f7d7ba54d4e2 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 17 Feb 2023 09:23:33 +0100 +Subject: [PATCH] Add missing header for GCC 13 + +--- + include/swoole_proxy.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/swoole_proxy.h b/include/swoole_proxy.h +index b74701ef0..6abf3cd24 100644 +--- a/include/swoole_proxy.h ++++ b/include/swoole_proxy.h +@@ -17,6 +17,7 @@ + #pragma once + + #include <string> ++#include <cstdint> + + #define SW_SOCKS5_VERSION_CODE 0x05 + diff --git a/php-pecl-openswoole22.spec b/php-pecl-openswoole22.spec index d4db1bb..1c5bf8e 100644 --- a/php-pecl-openswoole22.spec +++ b/php-pecl-openswoole22.spec @@ -1,7 +1,7 @@ # remirepo spec file for php-pecl-openswoole22 # -# Copyright (c) 2013-2022 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2013-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -36,13 +36,15 @@ Summary: High Performance Programmatic Server for PHP with Async IO, Coroutines and Fibers Name: %{?scl_prefix}php-pecl-%{pecl_name}22 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -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;')}} # SPDX: extension is Apache-2.0 # hiredis is BSD-3-Clause License: Apache-2.0 AND BSD-3-Clause URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz +Patch0: %{pecl_name}-gcc13.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?dtsprefix}gcc-c++ @@ -132,6 +134,8 @@ sed \ cd NTS +%patch0 -p1 -b .pr304 + cp -p thirdparty/hiredis/COPYING hiredis-COPYING cp -p thirdparty/nghttp2/COPYING nghttp2-COPYING @@ -300,6 +304,10 @@ cd ../ZTS %changelog +* Fri Feb 17 2023 Remi Collet <remi@remirepo.net> - 22.0.0-2 +- fix GCC 13 build using patch from + https://github.com/openswoole/ext-openswoole/pull/304 + * Thu Dec 22 2022 Remi Collet <remi@remirepo.net> - 22.0.0-1 - update to 22.0.0 - rename to php-pecl-openswoole22 for new API |