From d3b8baa5e7a1304cba0d99807dceb22c6c312403 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sat, 8 Apr 2023 18:44:46 +0800 Subject: [PATCH] support swow --- config/ext.json | 4 +--- config/lib.json | 11 +---------- src/SPC/builder/Extension.php | 1 - 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/config/ext.json b/config/ext.json index 7c4d531e..f54a30ff 100644 --- a/config/ext.json +++ b/config/ext.json @@ -301,14 +301,12 @@ "swow": { "type": "external", "source": "swow", - "lib-depends": [ - "libuv" - ], "lib-suggests": [ "openssl", "curl" ], "ext-suggests": [ + "openssl", "curl" ] }, diff --git a/config/lib.json b/config/lib.json index e872126f..81a19032 100644 --- a/config/lib.json +++ b/config/lib.json @@ -164,15 +164,6 @@ "zlib" ] }, - "libuv": { - "source": "libuv", - "static-libs-unix": [ - "libuv.a" - ], - "headers": [ - "uv.h" - ] - }, "libxml2": { "source": "libxml2", "static-libs-unix": [ @@ -302,7 +293,7 @@ "headers": [ "openssl" ], - "lib-suggests": [ + "lib-depends": [ "zlib" ] }, diff --git a/src/SPC/builder/Extension.php b/src/SPC/builder/Extension.php index 8af0623a..abe60f8a 100644 --- a/src/SPC/builder/Extension.php +++ b/src/SPC/builder/Extension.php @@ -300,7 +300,6 @@ class Extension case 'swow': $arg .= $this->builder->getLib('openssl') ? ' --enable-swow-ssl' : ' --disable-swow-ssl'; $arg .= $this->builder->getLib('curl') ? ' --enable-swow-curl' : ' --disable-swow-curl'; - $arg .= ' SWOW_UV_CFLAGS=-I"' . BUILD_INCLUDE_PATH . '" '; break; case 'swoole': if ($this->builder->getLib('openssl')) {