Skip to content
Permalink
Browse files
Add version to recipe, add executable linking workaround for test_pac…
…kage.
  • Loading branch information
PengZheng committed Apr 4, 2022
1 parent c6b047e commit 7c68393a7c28792168c127c560b143ad18198f7a
Showing 2 changed files with 8 additions and 3 deletions.
@@ -25,6 +25,7 @@

class CelixConan(ConanFile):
name = "celix"
version = "2.3.0"
homepage = "https://celix.apache.org"
url = "https://github.com/apache/celix.git"
topics = ("conan", "celix", "osgi", "embedded", "linux", "C/C++")
@@ -193,7 +194,6 @@ def requirements(self):
self.options['zlib'].shared = True
self.requires("libuuid/1.0.3")
self.options['libuuid'].shared = True
self.requires("openssl/1.1.1n")
self.requires("libzip/[>=1.7.3 <2.0.0]")
self.options['libzip'].shared = True
self.options['openssl'].shared = True
@@ -203,7 +203,9 @@ def requirements(self):
if self.options.enable_address_sanitizer:
self.options["cpputest"].with_leak_detection = False
if self.options.celix_add_openssl_dep:
self.requires("openssl/1.1.1k")
# fix a remotely exploitable OpenSSL/LibreSSL vulnerability
# https://lwn.net/Articles/887970/
self.requires("openssl/1.1.1n")
if self.options.build_remote_service_admin or self.options.build_shell_bonjour:
self.requires("libxml2/[>=2.9.9 <3.0.0]")
if self.options.build_cxx_remote_service_admin:
@@ -50,7 +50,10 @@ def build(self):
cmake.definitions["TEST_PUSHSTREAMS"] = self.options["celix"].build_pushstreams
cmake.definitions["CMAKE_PROJECT_test_package_INCLUDE"] = os.path.join(self.build_folder, "conan_paths.cmake")
# the following is workaround https://github.com/conan-io/conan/issues/7192
cmake.definitions["CMAKE_EXE_LINKER_FLAGS"] = "-Wl,--unresolved-symbols=ignore-in-shared-libs"
if self.settings.os == "Linux":
cmake.definitions["CMAKE_EXE_LINKER_FLAGS"] = "-Wl,--unresolved-symbols=ignore-in-shared-libs"
elif self.settings.os == "Macos":
cmake.definitions["CMAKE_EXE_LINKER_FLAGS"] = "-Wl,-undefined -Wl,dynamic_lookup"
cmake.configure()
cmake.build()

0 comments on commit 7c68393

Please sign in to comment.