From 65f012bf9a0c2374518b62b271ff36ea565e1906 Mon Sep 17 00:00:00 2001 From: toge Date: Sun, 29 Jan 2023 03:45:57 +0900 Subject: [PATCH] (#15369) highway: add version 1.0.3 * highway: add version 1.0.3 * link math lib --- recipes/highway/all/conandata.yml | 7 +++++++ recipes/highway/all/conanfile.py | 10 +++++----- recipes/highway/config.yml | 2 ++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/recipes/highway/all/conandata.yml b/recipes/highway/all/conandata.yml index 08bd076261..ae12819eb4 100644 --- a/recipes/highway/all/conandata.yml +++ b/recipes/highway/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.0.3": + url: "https://github.com/google/highway/archive/1.0.3.tar.gz" + sha256: "566fc77315878473d9a6bd815f7de78c73734acdcb745c3dde8579560ac5440e" "1.0.2": url: "https://github.com/google/highway/archive/1.0.2.tar.gz" sha256: "e8ef71236ac0d97f12d553ec1ffc5b6375d57b5f0b860c7447dd69b6ed1072db" @@ -23,5 +26,9 @@ sources: patches: "0.16.0": - patch_file: "patches/0.16.0-0001-fix-sys-random-h.patch" + patch_description: "fix including sys/random.h on several environments" + patch_type: "portability" "0.11.1": - patch_file: "patches/0.11.1-0001-remove-contrib.patch" + patch_description: "remove contrib sources" + patch_type: "portability" diff --git a/recipes/highway/all/conanfile.py b/recipes/highway/all/conanfile.py index a659244ef9..b77f950fd3 100644 --- a/recipes/highway/all/conanfile.py +++ b/recipes/highway/all/conanfile.py @@ -6,7 +6,7 @@ from conan.tools.files import apply_conandata_patches, copy, export_conandata_pa from conan.tools.scm import Version import os -required_conan_version = ">=1.52.0" +required_conan_version = ">=1.53.0" class HighwayConan(ConanFile): @@ -51,10 +51,7 @@ class HighwayConan(ConanFile): if Version(self.version) < "0.16.0": del self.options.shared elif self.options.shared: - try: - del self.options.fPIC - except Exception: - pass + self.options.rm_safe("fPIC") def layout(self): cmake_layout(self, src_folder="src") @@ -116,3 +113,6 @@ class HighwayConan(ConanFile): self.cpp_info.components["hwy_test"].set_property("pkg_config_name", "libhwy-test") self.cpp_info.components["hwy_test"].libs = ["hwy_test"] self.cpp_info.components["hwy_test"].requires = ["hwy"] + + if self.settings.os in ["Linux", "FreeBSD"]: + self.cpp_info.system_libs.append("m") diff --git a/recipes/highway/config.yml b/recipes/highway/config.yml index a34a1de737..0828672232 100644 --- a/recipes/highway/config.yml +++ b/recipes/highway/config.yml @@ -1,4 +1,6 @@ versions: + "1.0.3": + folder: all "1.0.2": folder: all "1.0.1":