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.

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

Update to paho-mqtt-c 1.3.8. Add -static to static compile libs. #4082

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions recipes/paho-mqtt-c/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ sources:
"1.3.6":
sha256: ecbc2c2000c6d8dcf1a76325312c61ed29db0b010acbd40cb92fcd4c014cd017
url: https://github.com/eclipse/paho.mqtt.c/archive/v1.3.6.tar.gz
"1.3.8":
sha256: 4920ff685344cdb0272568bc4414dcf48fcdfc4a98c78b1f3ca49c38417bf391
url: https://github.com/eclipse/paho.mqtt.c/archive/v1.3.8.tar.gz
patches:
"1.3.0":
- patch_file: "patches/0001-fix-MinGW-and-OSX-builds-for-1-3-0.patch"
Expand All @@ -40,3 +43,8 @@ patches:
base_path: "source_subfolder"
- patch_file: "patches/0004-fix-cmake-install.patch"
base_path: "source_subfolder"
"1.3.8":
- patch_file: "patches/0002-fix-MinGW-and-OSX-builds-for-1-3-5.patch"
base_path: "source_subfolder"
- patch_file: "patches/0005-fix-cmake-install-static-for-1.3.8.patch"
base_path: "source_subfolder"
8 changes: 4 additions & 4 deletions recipes/paho-mqtt-c/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class PahoMqttcConan(ConanFile):
homepage = "https://github.com/eclipse/paho.mqtt.c"
topics = ("MQTT", "IoT", "eclipse", "SSL", "paho", "C")
license = "EPL-2.0"
description = """Eclipse Paho MQTT C client library for Linux, Windows and MacOS"""
description = "Eclipse Paho MQTT C client library for Linux, Windows and MacOS"
exports_sources = ["CMakeLists.txt", "patches/*"]
generators = "cmake"
settings = "os", "arch", "compiler", "build_type"
Expand Down Expand Up @@ -44,7 +44,7 @@ def configure(self):

def requirements(self):
if self.options.ssl:
self.requires("openssl/1.1.1g")
self.requires("openssl/1.1.1i")

def source(self):
tools.get(**self.conan_data["sources"][self.version])
Expand All @@ -71,7 +71,7 @@ def _configure_cmake(self):
return self._cmake

def build(self):
for patch in self.conan_data["patches"][self.version]:
for patch in self.conan_data.get("patches", {}).get(self.version, []):
tools.patch(**patch)
cmake = self._configure_cmake()
cmake.build()
Expand Down Expand Up @@ -119,6 +119,6 @@ def _cmake_target(self):
target += "a" if self.options.asynchronous else "c"
if self.options.ssl:
target += "s"
if not self.options.shared:
if self.settings.os != "Windows" and not self.options.shared:
target += "-static"
return target
Loading