diff options
| author | Remi Collet <remi@remirepo.net> | 2026-02-27 10:35:25 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2026-02-27 10:35:25 +0100 |
| commit | f0c4e46fc7f636393e0c927a60991ae5e715ca1e (patch) | |
| tree | 85701fe1332ccdee1f06d432d14d2c396a09d645 | |
| parent | 585fd601087c79a115346e51e7be057fead1332b (diff) | |
enable firebird using patch from
https://github.com/swoole/swoole-src/pull/6013
| -rw-r--r-- | 6013.patch | 46 | ||||
| -rw-r--r-- | PHPINFO | 3 | ||||
| -rw-r--r-- | REFLECTION | 3 | ||||
| -rw-r--r-- | php-pecl-swoole6.spec | 18 |
4 files changed, 60 insertions, 10 deletions
diff --git a/6013.patch b/6013.patch new file mode 100644 index 0000000..6ee45b4 --- /dev/null +++ b/6013.patch @@ -0,0 +1,46 @@ +From 06c7656c218c284bbb793a18a54ef221f125335c Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 27 Feb 2026 10:29:56 +0100 +Subject: [PATCH] Fix #6004 drop broken conditionals, PHP_VERSION_ID not + defined + +--- + thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp | 2 -- + thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp | 3 --- + 2 files changed, 5 deletions(-) + +diff --git a/thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp b/thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp +index 2c07099252..715963eec1 100644 +--- a/thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp ++++ b/thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp +@@ -18,7 +18,6 @@ + #include <firebird/Interface.h> + #include <cstring> + +-#if PHP_VERSION_ID < 80500 + /* Returns the client version. 0 bytes are minor version, 1 bytes are major version. */ + extern "C" unsigned fb_get_client_version(void) + { +@@ -90,4 +89,3 @@ extern "C" ISC_STATUS fb_decode_timestamp_tz(ISC_STATUS* isc_status, const ISC_T + } + + #endif +-#endif +diff --git a/thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp b/thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp +index 1398b42260..715963eec1 100644 +--- a/thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp ++++ b/thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp +@@ -18,8 +18,6 @@ + #include <firebird/Interface.h> + #include <cstring> + +-#if PHP_VERSION_ID >= 80500 +- + /* Returns the client version. 0 bytes are minor version, 1 bytes are major version. */ + extern "C" unsigned fb_get_client_version(void) + { +@@ -91,4 +89,3 @@ extern "C" ISC_STATUS fb_decode_timestamp_tz(ISC_STATUS* isc_status, const ISC_T + } + + #endif +-#endif @@ -4,7 +4,7 @@ swoole Swoole => enabled Author => Swoole Team <team@swoole.com> Version => 6.2.0RC1 -Built => Feb 17 2026 00:00:00 +Built => Feb 27 2026 00:00:00 host byte order => little endian coroutine => enabled with boost asm context trace_log => enabled @@ -33,6 +33,7 @@ postgresql(libpq) version => 18.0 coroutine_pgsql => enabled coroutine_odbc => enabled coroutine_sqlite => enabled +coroutine_firebird => enabled execinfo => enabled Directive => Local Value => Master Value @@ -41,7 +41,7 @@ Extension [ <persistent> extension #120 swoole version 6.2.0RC1 ] { } } - - Constants [417] { + - Constants [418] { Constant [ <persistent> string SWOOLE_VERSION ] { 6.2.0RC1 } Constant [ <persistent> int SWOOLE_VERSION_ID ] { 60200 } Constant [ <persistent> int SWOOLE_MAJOR_VERSION ] { 6 } @@ -330,6 +330,7 @@ Extension [ <persistent> extension #120 swoole version 6.2.0RC1 ] { Constant [ <persistent> int SWOOLE_HOOK_PDO_PGSQL ] { 65536 } Constant [ <persistent> int SWOOLE_HOOK_PDO_ODBC ] { 131072 } Constant [ <persistent> int SWOOLE_HOOK_PDO_SQLITE ] { 524288 } + Constant [ <persistent> int SWOOLE_HOOK_PDO_FIREBIRD ] { 1048576 } Constant [ <persistent> int SWOOLE_HOOK_NET_FUNCTION ] { 2097152 } Constant [ <persistent> int SWOOLE_HOOK_MONGODB ] { 4194304 } Constant [ <persistent> int SWOOLE_HOOK_ALL ] { 2143287295 } diff --git a/php-pecl-swoole6.spec b/php-pecl-swoole6.spec index 52e9848..9728481 100644 --- a/php-pecl-swoole6.spec +++ b/php-pecl-swoole6.spec @@ -43,13 +43,11 @@ %bcond_without zstd %bcond_without curl %bcond_without nghttpd2 +%bcond_without firebird # Conflicts with ssh2/ftp extensions # See https://github.com/swoole/swoole-src/issues/6003 %bcond_with ssh2 %bcond_with ftp -# Disabled by default to avoid dependencies (pdo_firebird and libfbclient) -# See https://github.com/swoole/swoole-src/issues/6004 -%bcond_with firebird %global upstream_version 6.2.0 %global upstream_prever RC1 @@ -59,7 +57,7 @@ Summary: PHP's asynchronous concurrent distributed networking framework Name: %{?scl_prefix}php-pecl-%{pecl_name}6 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Release: 2%{?dist} # Extension is Apache-2.0 # BSD-3-Clause: Hiredis # MIT: nlohmann/json, nghttp2, llhttp @@ -67,6 +65,8 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz +Patch0: 6013.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?dtsprefix}gcc-c++ @@ -125,9 +125,6 @@ Requires: %{?scl_prefix}php-json%{?_isa} Requires: %{?scl_prefix}php-sockets%{?_isa} Requires: %{?scl_prefix}php-mysqlnd%{?_isa} Requires: %{?scl_prefix}php-pdo%{?_isa} -%if %{with firebird} -Requires: %{?scl_prefix}php-pdo-firebird%{?_isa} -%endif # Extension Provides: %{?scl_prefix}php-%{pecl_name} = %{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} @@ -208,6 +205,8 @@ sed \ cd %{sources} +%patch -P0 -p1 + cp -p thirdparty/hiredis/COPYING hiredis-COPYING %if %{with nghttpd2} rm -r thirdparty/nghttp2 @@ -360,7 +359,6 @@ OPT="--no-php-ini" [ -f %{php_extdir}/sockets.so ] && OPT="$OPT -d extension=sockets" [ -f %{php_extdir}/mysqlnd.so ] && OPT="$OPT -d extension=mysqlnd" [ -f %{php_extdir}/pdo.so ] && OPT="$OPT -d extension=pdo" -[ -f %{php_extdir}/pdo_firebird.so ] && OPT="$OPT -d extension=pdo_firebird" cd NTS : Minimal load test for NTS extension @@ -408,6 +406,10 @@ cd ../ZTS %changelog +* Fri Feb 27 2026 Remi Collet <remi@remirepo.net> - 6.2.0~RC1-2 +- enable firebird using patch from + https://github.com/swoole/swoole-src/pull/6013 + * Tue Feb 17 2026 Remi Collet <remi@remirepo.net> - 6.2.0~RC1-1 - update to 6.2.0RC1 - disable io_uring feature |
