From 9c19f6b38c0da947183b91f20bdd162b275428c3 Mon Sep 17 00:00:00 2001 From: mjvankampen Date: Sat, 13 Feb 2021 02:31:46 +0100 Subject: [PATCH] (#4537) Adds sentry-native 0.4.7 * Adds sentry-native 0.4.7 * Adds invalid conf on apple-clang < 10 * Fixes bad settings --- recipes/sentry-native/all/conandata.yml | 3 +++ recipes/sentry-native/all/conanfile.py | 5 +++++ recipes/sentry-native/config.yml | 2 ++ 3 files changed, 10 insertions(+) diff --git a/recipes/sentry-native/all/conandata.yml b/recipes/sentry-native/all/conandata.yml index 7aecc5d4b7e59..882d1affea5df 100644 --- a/recipes/sentry-native/all/conandata.yml +++ b/recipes/sentry-native/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "0.4.7": + url: "https://github.com/getsentry/sentry-native/archive/0.4.7.tar.gz" + sha256: "84f3a1dbfea1245870a7e36eef06ea78e21c173457c543eaa27904d2d017e50c" "0.4.1": url: "https://github.com/getsentry/sentry-native/archive/0.4.1.tar.gz" sha256: "a7d04fe9b9175c30a58ce20ae23b510595045a66884a447dd21ff2d0c749751b" diff --git a/recipes/sentry-native/all/conanfile.py b/recipes/sentry-native/all/conanfile.py index b2b00fb83d0ef..197254770f6e6 100644 --- a/recipes/sentry-native/all/conanfile.py +++ b/recipes/sentry-native/all/conanfile.py @@ -49,6 +49,8 @@ def configure(self): raise ConanInvalidConfiguration("The in-process backend is not supported on Windows") if self.options.transport == "winhttp" and self.settings.os != "Windows": raise ConanInvalidConfiguration("The winhttp transport is only supported on Windows") + if tools.Version(self.version) >= "0.4.7" and self.settings.compiler == "apple-clang" and tools.Version(self.settings.compiler.version) < "10.0": + raise ConanInvalidConfiguration("apple-clang < 10.0 not supported") def requirements(self): if self.options.transport == "curl": @@ -99,7 +101,10 @@ def package_info(self): self.cpp_info.system_libs = ["dl", "log"] elif self.settings.os == "Windows": self.cpp_info.system_libs = ["shlwapi", "dbghelp"] + if tools.Version(self.version) >= "0.4.7": + self.cpp_info.system_libs.append("Version") if self.options.transport == "winhttp": self.cpp_info.system_libs.append("winhttp") + if not self.options.shared: self.cpp_info.defines = ["SENTRY_BUILD_STATIC"] diff --git a/recipes/sentry-native/config.yml b/recipes/sentry-native/config.yml index cde7c5e17d87a..13b308ea9760e 100644 --- a/recipes/sentry-native/config.yml +++ b/recipes/sentry-native/config.yml @@ -1,4 +1,6 @@ versions: + "0.4.7": + folder: all "0.4.1": folder: all "0.2.6":