diff --git a/conan-recipes/libnode/all/conanfile.py b/conan-recipes/libnode/all/conanfile.py index 1ec8a69e60..d3c04eb7da 100644 --- a/conan-recipes/libnode/all/conanfile.py +++ b/conan-recipes/libnode/all/conanfile.py @@ -40,7 +40,7 @@ class libnodeConan(ConanFile): def requirements(self): self.requires("brotli/[>1.0 <1.2]") - # 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("llhttp/6.1.1@overte/stable") # self.requires("libnghttp2/[>1.50 <1.60]") # self.requires("libuv/[>1.40 <1.50]") self.requires("openssl/1.1.1w") @@ -76,7 +76,7 @@ class libnodeConan(ConanFile): 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 @@ class libnodeConan(ConanFile): # 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 index 810637cb64..59a059a6c3 100644 --- a/conanfile.py +++ b/conanfile.py @@ -56,7 +56,7 @@ class Overte(ConanFile): self.requires("gli/cci.20210515") self.requires("glslang/11.7.0") self.requires("liblo/0.30@overte/stable") - self.requires("libnode/18.20.6@overte/stable") + self.requires("libnode/18.20.6@overte/stable#85a7e34916bfaa1b699f59f2e8721e9e") self.requires("nlohmann_json/3.11.2") self.requires("nvidia-texture-tools/2023.01@overte/stable") self.requires("onetbb/2021.10.0")