From 3df506b34935bae0bd649d6ba1862432e1ee68b1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 Jan 2024 10:35:46 +0100 Subject: update to 5.1.2 fix out of sources tree build using patch from https://github.com/swoole/swoole-src/pull/5239 --- 5239.patch | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 5239.patch (limited to '5239.patch') diff --git a/5239.patch b/5239.patch new file mode 100644 index 0000000..31a61c4 --- /dev/null +++ b/5239.patch @@ -0,0 +1,34 @@ +From e7c56d9842d17df0647d8e87251a2f70f06cde63 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Wed, 24 Jan 2024 09:56:17 +0100 +Subject: [PATCH] Fix out of sources tree build + +--- + config.m4 | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/config.m4 b/config.m4 +index 2e8c166021..d68d06b6df 100644 +--- a/config.m4 ++++ b/config.m4 +@@ -1009,14 +1009,19 @@ EOF + AC_DEFINE(SW_USE_MYSQLND, 1, [use mysqlnd]) + fi + +- if test -f "ext-src/php_swoole.cc"; then ++ AC_MSG_CHECKING([for sources]) ++ if test -f "$abs_srcdir/ext-src/php_swoole.cc"; then ++ swoole_source_dir=$abs_srcdir ++ elif test -f "ext-src/php_swoole.cc"; then + swoole_source_dir=$(pwd) + else + swoole_source_dir="ext/swoole" + fi ++ AC_MSG_RESULT([$swoole_source_dir]) + + ext_src_files=$(cd $swoole_source_dir && find ext-src/ -name *.cc) + lib_src_files=$(cd $swoole_source_dir && find src/ -name *.cc) ++ + swoole_source_file="${ext_src_files} ${lib_src_files}" + + swoole_source_file="$swoole_source_file \ -- cgit