Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libnghttp2: Improve CMake handling #26068

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+68 −83
Draft

libnghttp2: Improve CMake handling #26068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b102d6c
Improve libnghttp2 CMake handling
AbrilRBS Nov 29, 2024
9677a27
dumdum
AbrilRBS Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions recipes/libnghttp2/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,3 @@ sources:
"1.53.0":
url: "https://github.com/nghttp2/nghttp2/releases/download/v1.53.0/nghttp2-1.53.0.tar.xz"
sha256: "b867184254e5a29b0ba68413aa14f8b0ce1142a371761374598dec092dabb809"
"1.51.0":
url: "https://github.com/nghttp2/nghttp2/releases/download/v1.51.0/nghttp2-1.51.0.tar.xz"
sha256: "66aa76d97c143f42295405a31413e5e7d157968dad9f957bb4b015b598882e6b"
"1.50.0":
url: "https://github.com/nghttp2/nghttp2/releases/download/v1.50.0/nghttp2-1.50.0.tar.xz"
sha256: "af24007e34c18c782393a1dc3685f8fd5b50283e90a9191d25488eb50aa2c825"
117 changes: 68 additions & 49 deletions recipes/libnghttp2/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import os


required_conan_version = ">=1.53.0"
required_conan_version = ">=2"


class Nghttp2Conan(ConanFile):
Expand All @@ -27,54 +27,44 @@ class Nghttp2Conan(ConanFile):
"with_app": [True, False],
"with_hpack": [True, False],
"with_jemalloc": [True, False],
"with_asio": [True, False],
}
default_options = {
"shared": False,
"fPIC": True,
"with_app": False,
"with_hpack": False,
"with_jemalloc": False,
"with_asio": False,
}

def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
implements = ["auto_shared_fpic"]

def configure(self):
if self.options.shared:
self.options.rm_safe("fPIC")
if not (self.options.with_app or self.options.with_hpack or self.options.with_asio):
self.settings.rm_safe("compiler.cppstd")
self.settings.rm_safe("compiler.libcxx")
if not self.options.with_app:
del self.options.with_jemalloc
if Version(self.version) >= "1.52.0":
del self.options.with_asio
if not (self.options.with_app or self.options.with_hpack):
self.settings.rm_safe("compiler.cppstd")
self.settings.rm_safe("compiler.libcxx")

def layout(self):
cmake_layout(self, src_folder="src")

def requirements(self):
if self.options.with_app or self.options.get_safe("with_asio"):
if self.options.with_app or self.options.with_hpack:
self.requires("openssl/[>=1.1 <4]")
self.requires("zlib/[>=1.2.11 <2]")
if self.options.with_app:
self.requires("c-ares/1.25.0")
self.requires("libev/4.33")
self.requires("libevent/2.1.12")
self.requires("libxml2/2.12.4")
self.requires("zlib/[>=1.2.11 <2]")
self.requires("c-ares/[>=1.27 <2]")
self.requires("libxml2/[>=2.12.5 <3]")
self.requires("brotli/1.1.0")
if self.options.with_jemalloc:
self.requires("jemalloc/5.3.0")
if self.options.with_hpack:
self.requires("jansson/2.14")
if self.options.get_safe("with_asio"):
self.requires("boost/1.84.0")

def validate(self):
if self.options.get_safe("with_asio") and is_msvc(self):
raise ConanInvalidConfiguration("Build with asio and MSVC is not supported yet, see upstream bug #589")
if self.settings.compiler == "gcc" and Version(self.settings.compiler.version) < "6":
raise ConanInvalidConfiguration(f"{self.ref} requires GCC >= 6.0")

Expand All @@ -83,6 +73,45 @@ def source(self):

def generate(self):
tc = CMakeToolchain(self)

tc.cache_variables["BUILD_TESTING"] = False
tc.cache_variables["ENABLE_DOC"] = False
if self.options.with_app:
tc.cache_variables["LIBEV_FOUND"] = True
tc.cache_variables["LIBCARES_FOUND"] = True
tc.cache_variables["LIBBROTLIENC_FOUND"] = True
tc.cache_variables["LIBBROTLIDEC_FOUND"] = True
tc.cache_variables["LIBXML2_FOUND"] = True
Comment on lines +80 to +84
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For testing until I discuss with the team

if self.options.with_hpack:
tc.cache_variables["JANSSON_FOUND"] = True

# Disable Python finding so we don't build docs
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Python3"] = True
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is NOT for testing and will remain after the PR leaves draft, it avoids cmake from trying to build the documentation

if not self.options.with_app:
# Disable find_package to not scare the user with system libs being picked
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libevent"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libbrotlienc"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libbrotlidec"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libngtcp2"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libngtcp2_crypto_quictls"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libnghttp3"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libbpf"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Systemd"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_LibXml2"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libev"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libcares"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Libbrotli"] = True # Examples only
Comment on lines +91 to +103
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For testing too, ensuring we're not missing any requirements for the lib

elif not self.options.with_jemalloc:
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Jemalloc"] = True

if not self.options.with_hpack:
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_Jansson"] = True # Examples only

if not self.options.with_app and not self.options.with_hpack:
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_OpenSSL"] = True # Examples only
tc.cache_variables["CMAKE_DISABLE_FIND_PACKAGE_ZLIB"] = True # Examples only


if Version(self.version) < "1.60.0":
tc.variables["ENABLE_SHARED_LIB"] = self.options.shared
tc.variables["ENABLE_STATIC_LIB"] = not self.options.shared
Expand All @@ -91,14 +120,9 @@ def generate(self):
tc.variables["ENABLE_HPACK_TOOLS"] = self.options.with_hpack
tc.variables["ENABLE_APP"] = self.options.with_app
tc.variables["ENABLE_EXAMPLES"] = False
if Version(self.version) < "1.52.0":
tc.variables["ENABLE_PYTHON_BINDINGS"] = False
tc.variables["ENABLE_FAILMALLOC"] = False
# disable unneeded auto-picked dependencies
tc.variables["WITH_LIBXML2"] = False
tc.variables["WITH_JEMALLOC"] = self.options.get_safe("with_jemalloc", False)
if Version(self.version) < "1.52.0":
tc.variables["ENABLE_ASIO_LIB"] = self.options.with_asio
# To avoid overwriting dll import lib by static lib
if Version(self.version) >= "1.60.0" and self.options.shared:
tc.variables["STATIC_LIB_SUFFIX"] = "-static"
Expand All @@ -108,6 +132,18 @@ def generate(self):
tc.generate()

tc = CMakeDeps(self)
if self.options.with_app:
tc.set_property("libev", "cmake_file_name", "Libev")
tc.set_property("libev", "cmake_additional_variables_prefixes", ["LIBEV"])
tc.set_property("c-ares", "cmake_file_name", "Libcares")
tc.set_property("c-ares", "cmake_additional_variables_prefixes", ["LIBCARES"])
tc.set_property("brotli", "cmake_file_name", "Libbrotlienc")
tc.set_property("brotli", "cmake_additional_variables_prefixes", ["LIBBROTLIENC", "LIBBROTLIDEC"])
tc.set_property("libxml2", "cmake_file_name", "LibXml2")
tc.set_property("libxml2", "cmake_additional_variables_prefixes", ["LIBXML2"])
if self.options.with_hpack:
tc.set_property("jansson", "cmake_file_name", "Jansson")
tc.set_property("jansson", "cmake_additional_variables_prefixes", ["JANSSON"])
tc.generate()
tc = PkgConfigDeps(self)
tc.generate()
Expand All @@ -128,19 +164,6 @@ def _patch_sources(self):
"\n"
"link_libraries(\n"
" {} ${{CONAN_LIBS}}\n".format(target_libnghttp2))
if not self.options.shared and Version(self.version) < "1.52.0":
replace_in_file(self, os.path.join(self.source_folder, "src", "CMakeLists.txt"),
"\n"
" add_library(nghttp2_asio SHARED\n",
"\n"
" add_library(nghttp2_asio\n")
replace_in_file(self, os.path.join(self.source_folder, "src", "CMakeLists.txt"),
"\n"
" target_link_libraries(nghttp2_asio\n"
" nghttp2\n",
"\n"
" target_link_libraries(nghttp2_asio\n"
f" {target_libnghttp2}\n")
replace_in_file(self, os.path.join(self.source_folder, "CMakeLists.txt"), "add_subdirectory(examples)", "")
replace_in_file(self, os.path.join(self.source_folder, "CMakeLists.txt"), "add_subdirectory(tests)", "")

Expand All @@ -164,26 +187,22 @@ def package_info(self):
if is_msvc(self) and not self.options.shared:
self.cpp_info.components["nghttp2"].defines.append("NGHTTP2_STATICLIB")

if self.options.get_safe("with_asio"):
self.cpp_info.components["nghttp2_asio"].set_property("pkg_config_name", "libnghttp2_asio")
self.cpp_info.components["nghttp2_asio"].libs = ["nghttp2_asio"]
self.cpp_info.components["nghttp2_asio"].requires = [
"nghttp2", "boost::headers", "openssl::openssl",
]

if self.options.with_app:
self.cpp_info.components["nghttp2_app"].requires = [
"openssl::openssl", "c-ares::c-ares", "libev::libev",
"libevent::libevent", "libxml2::libxml2", "zlib::zlib",
"libxml2::libxml2", "zlib::zlib", "brotli::brotli"
]
if self.options.with_jemalloc:
self.cpp_info.components["nghttp2_app"].requires.append("jemalloc::jemalloc")

if self.settings.os in ("Linux", "FreeBSD"):
self.cpp_info.components["nghttp2_app"].system_libs.append("pthread")

if self.options.with_hpack:
self.cpp_info.components["nghttp2_hpack"].requires = ["jansson::jansson"]
self.cpp_info.components["nghttp2_hpack"].requires = ["jansson::jansson", "openssl::openssl", "zlib::zlib"]

if self.options.with_app or self.options.with_hpack:
self.env_info.PATH.append(os.path.join(self.package_folder, "bin"))
self.runenv_info.append_path("PATH", os.path.join(self.package_folder, "bin"))

# trick for internal conan usage to pick up in downsteam pc files the pc file including all libs components
self.cpp_info.set_property("pkg_config_name", "libnghttp2_asio" if self.options.get_safe("with_asio") else "libnghttp2")
self.cpp_info.set_property("pkg_config_name", "libnghttp2")
7 changes: 0 additions & 7 deletions recipes/libnghttp2/all/test_v1_package/CMakeLists.txt
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions recipes/libnghttp2/all/test_v1_package/conanfile.py
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions recipes/libnghttp2/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,3 @@ versions:
folder: all
"1.53.0":
folder: all
"1.51.0":
folder: all
"1.50.0":
folder: all