Update libnode.

overte-org · Jan 24, 2025 · 9da5100 · 9da5100
1 parent 15c2aa0
commit 9da5100
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/conan-recipes/libnode/all/conandata.yml b/conan-recipes/libnode/all/conandata.yml
@@ -2,6 +2,9 @@ sources:
   18.17.1:
     sha256: 1cc1670bc183eaf9e0afe0258391695d1d6ae1be02ba4c26e0218cf5f19b96f7
     url: https://github.com/nodejs/node/archive/refs/tags/v18.17.1.tar.gz
+  18.20.6:
+    sha256: 84b563933f5f38738ec8ea4050d1672f9d0fce8336735457156c39f3fbe2ff1f
+    url: https://github.com/nodejs/node/archive/refs/tags/v18.20.6.tar.gz
   21.6.2:
     sha256: 24a2de72478e1aa60bc830092e8f331f86aedd41e7e3f98fcb66bf5f02bdb578
     url: https://github.com/nodejs/node/archive/refs/tags/v21.6.2.tar.gz
diff --git a/conan-recipes/libnode/all/conanfile.py b/conan-recipes/libnode/all/conanfile.py
@@ -40,7 +40,7 @@ def build_requirements(self):
 
     def requirements(self):
         self.requires("brotli/[>1.0 <1.2]")
-        self.requires("llhttp/[>6.0 <7.0]")
+        # self.requires("llhttp/[>6.0 <7.0]") NodeJS 18.20.6 required (and comes with) llhttp version 6.1.1, which isn't packaged.
         # self.requires("libnghttp2/[>1.50 <1.60]")
         # self.requires("libuv/[>1.40 <1.50]")
         self.requires("openssl/1.1.1w")
@@ -76,7 +76,7 @@ def generate(self):
             node_build_env.define("PKG_CONFIG_PATH", self.build_folder)
             envvars = node_build_env.vars(self)
             envvars.save_script("node_build_env")
-            rename(self, "libllhttp.pc", "http_parser.pc")
+            # rename(self, "libllhttp.pc", "http_parser.pc")
 
     def build(self):
         args = [
@@ -96,7 +96,7 @@ def build(self):
         # args += self.__add_shared("libnghttp2", "nghttp2")
         # args += self.__add_shared("libuv", "libuv")
         args += self.__add_shared("brotli", "brotli")
-        args += self.__add_shared("llhttp", "http-parser")
+        # args += self.__add_shared("llhttp", "http-parser")
         args += self.__add_shared("openssl", "openssl")
         args += self.__add_shared("zlib", "zlib")
 

diff --git a/conanfile.py b/conanfile.py
@@ -56,7 +56,7 @@ def requirements(self):
         self.requires("gli/cci.20210515")
         self.requires("glslang/11.7.0")
         self.requires("liblo/0.30@overte/stable")
-        self.requires("libnode/18.17.1@overte/stable")
+        self.requires("libnode/18.20.6@overte/stable")
         self.requires("nlohmann_json/3.11.2")
         self.requires("nvidia-texture-tools/2023.01@overte/stable")
         self.requires("onetbb/2021.10.0")