diff --git a/node14/node14.spec b/node14/node14.spec index cd967f3139..5e7e362d22 100644 --- a/node14/node14.spec +++ b/node14/node14.spec @@ -22,8 +22,8 @@ ## # package version -%define V_opkg 14.17.4 -%define V_dist 14.17.4 +%define V_opkg 14.17.5 +%define V_dist 14.17.5 # package information Name: node14 @@ -36,7 +36,7 @@ Class: PLUS Group: Web License: MIT/BSD Version: %{V_opkg} -Release: 20210729 +Release: 20210811 # package options %option with_icu yes @@ -50,8 +50,8 @@ Patch0: node14.patch # build information BuildPreReq: OpenPKG, openpkg >= 20160101, make, gcc, gcc::with_cxx = yes, python, pkgconfig PreReq: OpenPKG, openpkg >= 20160101 -BuildPreReq: openssl, libexecinfo, zlib, ares, libuv, nghttp2 -PreReq: openssl, libexecinfo, zlib, ares, libuv, nghttp2 +BuildPreReq: openssl, libexecinfo, zlib, libuv, nghttp2 +PreReq: openssl, libexecinfo, zlib, libuv, nghttp2 %if "%{with_icu}" == "yes" BuildPreReq: icu PreReq: icu @@ -87,6 +87,9 @@ Provides: node = %{version} %endif cflags="$cflags -I`pwd`/deps/llhttp/include" cflags="$cflags -I`pwd`/deps/http_parser" + cflags="$cflags -I`pwd`/deps/cares" + cflags="$cflags -I`pwd`/deps/cares/include" + cflags="$cflags -I`pwd`/deps/cares/src/lib" cflags="$cflags %{l_cppflags}" ldflags="%{l_ldflags}" mkdir tool @@ -120,10 +123,6 @@ Provides: node = %{version} --shared-zlib-includes=%{l_prefix}/include \ --shared-zlib-libpath=%{l_prefix}/lib \ --shared-zlib-libname="z" \ - --shared-cares \ - --shared-cares-includes=%{l_prefix}/include \ - --shared-cares-libpath=%{l_prefix}/lib \ - --shared-cares-libname="ares" \ --shared-libuv \ --shared-libuv-includes=%{l_prefix}/include \ --shared-libuv-libpath=%{l_prefix}/lib \