Skip to content

Commit

Permalink
(#4063) add paho-mqtt-c/1.3.8
Browse files Browse the repository at this point in the history
* update openssl to 1.1.1i

* nit-picking changes

* add paho-mqtt-c/1.3.8
  • Loading branch information
Croydon authored Jan 9, 2021
1 parent 1300210 commit 30b6912
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
11 changes: 9 additions & 2 deletions recipes/paho-mqtt-c/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@ sources:
sha256: 996eef9e498519da79108f58a887a34abc50cd76770b19b0300b27783706c71f
url: https://github.com/eclipse/paho.mqtt.c/archive/v1.3.5.tar.gz
"1.3.6":
sha256: ecbc2c2000c6d8dcf1a76325312c61ed29db0b010acbd40cb92fcd4c014cd017
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 @@ -29,7 +33,7 @@ patches:
- patch_file: "patches/0002-fix-MinGW-and-OSX-builds-for-1-3-4.patch"
base_path: "source_subfolder"
- patch_file: "patches/0004-fix-cmake-install.patch"
base_path: "source_subfolder"
base_path: "source_subfolder"
"1.3.5":
- patch_file: "patches/0002-fix-MinGW-and-OSX-builds-for-1-3-5.patch"
base_path: "source_subfolder"
Expand All @@ -40,3 +44,6 @@ 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"
7 changes: 4 additions & 3 deletions recipes/paho-mqtt-c/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
from conans import CMake, ConanFile, tools
from conans.errors import ConanInvalidConfiguration


class PahoMqttcConan(ConanFile):
name = "paho-mqtt-c"
url = "https://github.com/conan-io/conan-center-index"
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 +45,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 +72,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
2 changes: 2 additions & 0 deletions recipes/paho-mqtt-c/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ versions:
folder: "all"
"1.3.6":
folder: "all"
"1.3.8":
folder: "all"

0 comments on commit 30b6912

Please sign in to comment.