Skip to content

Commit

Permalink
Merge branch 'master' into migrate/libfabric
Browse files Browse the repository at this point in the history
  • Loading branch information
valgur authored Dec 21, 2023
2 parents 5ca9136 + cbfbc41 commit 38ae28b
Show file tree
Hide file tree
Showing 84 changed files with 594 additions and 184 deletions.
6 changes: 6 additions & 0 deletions .c3i/authorized_users.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1250,3 +1250,9 @@ authorized_users:
- mlutken
- hoyhoy
- stevenhartley
- RMZeroFour
- rymut
- MartyMcFlyInTheSky
- piliugin-anton
- Drllap
- i-curve
6 changes: 6 additions & 0 deletions .c3i/conan_v2_ready_references.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ required_for_references:
- asio
- asio-grpc
- asmjit
- asn1c
- assimp
- astc-codec
- astro-informatics-so3
Expand Down Expand Up @@ -270,11 +271,13 @@ required_for_references:
- debug_assert
- decimal_for_cpp
- deco
- dependencies
- detools
- dfp
- di
- dice-template-library
- dime
- directshowbaseclasses
- directx-headers
- dirent
- discount
Expand Down Expand Up @@ -620,6 +623,7 @@ required_for_references:
- libdxfrw
- libe57format
- libelf
- libelfin
- libenvpp
- libepoxy
- libev
Expand Down Expand Up @@ -1046,6 +1050,7 @@ required_for_references:
- poshlib
- pprint
- pranav-csv2
- premake
- pretty-name
- procxx-boost-ext-simd
- proj
Expand Down Expand Up @@ -1246,6 +1251,7 @@ required_for_references:
- taocpp-sequences
- taocpp-taopq
- taocpp-tuple
- tar
- taskflow
- taywee-args
- tcb-span
Expand Down
11 changes: 3 additions & 8 deletions .c3i/config_v1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ tasks:
# Profile configurations to build packages
configurations:
- id: linux-gcc
epochs: [20211221, 20220120, 20230606]
hrname: "Linux, GCC"
content:
- os: ["Linux"]
Expand All @@ -86,7 +85,6 @@ configurations:
compiler.version: ["5", "7", "9", "10", "11"]
build_type: ["Release", "Debug"]
- id: linux-clang
epochs: [20211221, 20220120, 20230606]
hrname: "Linux, Clang"
content:
- os: ["Linux"]
Expand All @@ -97,8 +95,10 @@ configurations:
compiler.version: ["12", "13"]
build_type: ["Release", "Debug"]
- id: macos-clang
epochs: [20220120, 20230606]
hrname: "macOS, Clang"
build_profile:
os: "Macos"
arch: "armv8"
content:
- os: [ "Macos" ]
arch: [ "x86_64" ]
Expand All @@ -108,11 +108,7 @@ configurations:
compiler.libcxx: [ "libc++" ]
build_type: [ "Release", "Debug" ]
- id: macos-m1-clang
epochs: [20220120, 20230606]
hrname: "macOS, Clang (M1/arm64)"
build_profile:
os: "Macos"
arch: "x86_64"
content:
- os: [ "Macos" ]
arch: [ "armv8" ]
Expand All @@ -122,7 +118,6 @@ configurations:
compiler.libcxx: [ "libc++" ]
build_type: [ "Release", "Debug" ]
- id: windows-visual_studio
epochs: [0, 20211221, 20220120, 20230606]
hrname: "Windows, Visual Studio"
content:
- os: [ "Windows" ]
Expand Down
7 changes: 2 additions & 5 deletions .c3i/config_v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ tasks:

configurations:
- id: linux-gcc
epochs: [0, 20211221, 20220120, 20220628, 20230606]
hrname: "Linux, GCC"
build_profile:
os: "Linux"
Expand All @@ -80,10 +79,10 @@ configurations:
compiler.version: ["11"]
build_type: ["Release"]
- id: macos-clang
epochs: [0, 20211221, 20220120, 20220628, 20230606]
hrname: "macOS, Clang"
build_profile:
os: "Macos"
arch: "armv8"
content:
- os: [ "Macos" ]
arch: [ "x86_64" ]
Expand All @@ -93,11 +92,10 @@ configurations:
compiler.libcxx: [ "libc++" ]
build_type: [ "Release"]
- id: macos-m1-clang
epochs: [0, 20211221, 20220120, 20220628, 20230606]
hrname: "macOS M1, Clang"
build_profile:
os: "Macos"
arch: "x86_64"
arch: "armv8"
content:
- os: [ "Macos" ]
arch: [ "armv8" ]
Expand All @@ -107,7 +105,6 @@ configurations:
compiler.libcxx: [ "libc++" ]
build_type: [ "Release"]
- id: windows-msvc
epochs: [20230606]
hrname: "Windows, MSVC"
build_profile:
os: "Windows"
Expand Down
3 changes: 3 additions & 0 deletions recipes/arduinojson/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"6.21.4":
url: "https://github.com/bblanchon/ArduinoJson/releases/download/v6.21.4/ArduinoJson-v6.21.4.zip"
sha256: "60a5c4cd28d97047f63a1f9c9e8bd36a72c8b4c86809babcc2bd4b00e0502b9b"
"6.21.2":
url: "https://github.com/bblanchon/ArduinoJson/releases/download/v6.21.2/ArduinoJson-v6.21.2.zip"
sha256: "1dc888061f6e7828f7a0a4e71bf059796e5ce202ce6ddb4e3a2e384d32b5cba0"
Expand Down
2 changes: 1 addition & 1 deletion recipes/arduinojson/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class ArduinojsonConan(ConanFile):
name = "arduinojson"
description = "C++ JSON library for IoT. Simple and efficient."
homepage = "https://github.com/bblanchon/ArduinoJson"
topics = ("json", "arduino", "iot", "embedded", "esp8266")
topics = ("json", "msgpack", "message-pack", "arduino", "iot", "embedded", "esp8266")
license = "MIT"
url = "https://github.com/conan-io/conan-center-index"
package_type = "header-library"
Expand Down
2 changes: 2 additions & 0 deletions recipes/arduinojson/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"6.21.4":
folder: all
"6.21.2":
folder: all
"6.21.0":
Expand Down
3 changes: 3 additions & 0 deletions recipes/arrow/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"14.0.2":
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-14.0.2/apache-arrow-14.0.2.tar.gz?action=download"
sha256: "1304dedb41896008b89fe0738c71a95d9b81752efc77fa70f264cb1da15d9bc2"
"14.0.1":
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-14.0.1/apache-arrow-14.0.1.tar.gz?action=download"
sha256: "5c70eafb1011f9d124bafb328afe54f62cc5b9280b7080e1e3d668f78c0e407e"
Expand Down
2 changes: 2 additions & 0 deletions recipes/arrow/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"14.0.2":
folder: all
"14.0.1":
folder: all
"14.0.0":
Expand Down
3 changes: 3 additions & 0 deletions recipes/asio/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"1.29.0":
url: "https://github.com/chriskohlhoff/asio/archive/asio-1-29-0.tar.gz"
sha256: "44305859b4e6664dbbf853c1ef8ca0259d694f033753ae309fcb2534ca20f721"
"1.28.2":
url: "https://github.com/chriskohlhoff/asio/archive/asio-1-28-2.tar.gz"
sha256: "5705a0e403017eba276625107160498518838064a6dd7fd8b00b2e30c0ffbdee"
Expand Down
2 changes: 2 additions & 0 deletions recipes/asio/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.29.0":
folder: all
"1.28.2":
folder: all
"1.28.1":
Expand Down
3 changes: 3 additions & 0 deletions recipes/bzip3/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"1.4.0":
url: "https://github.com/kspalaiologos/bzip3/releases/download/1.4.0/bzip3-1.4.0.tar.xz"
sha256: "516489784351abe027dc8b4bcad74d12937c5668d317e27de8c5cebc4d7884dc"
"1.3.2":
url: "https://github.com/kspalaiologos/bzip3/releases/download/1.3.2/bzip3-1.3.2.tar.xz"
sha256: "b1d04b8b1b89a3c490cf2b89ea8cee1281584b07f25276fcfd8d40ec2c488e94"
Expand Down
2 changes: 2 additions & 0 deletions recipes/bzip3/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.4.0":
folder: all
"1.3.2":
folder: all
"1.3.1":
Expand Down
2 changes: 1 addition & 1 deletion recipes/c4core/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def layout(self):

def requirements(self):
if self.options.with_fast_float:
self.requires("fast_float/5.3.0", transitive_headers=True)
self.requires("fast_float/6.0.0", transitive_headers=True)

def validate(self):
if self.settings.compiler.get_safe("cppstd"):
Expand Down
11 changes: 9 additions & 2 deletions recipes/coin-lemon/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,12 @@ sources:
sha256: "71b7c725f4c0b4a8ccb92eb87b208701586cf7a96156ebd821ca3ed855bad3c8"
patches:
"1.3.1":
- patch_file: "patches/cmake-add-runtime-destination_1.3.1.patch"
- patch_file: "patches/0001-remove-register-keyword.patch"
- patch_file: "patches/0001-cmake-add-runtime-destination.patch"
patch_description: "Fix install destination of dll"
patch_type: "conan"
- patch_file: "patches/0002-cpp17-compat-remove-register-keyword.patch"
patch_description: "C++17 compatibility: remove register keyword"
patch_type: "portability"
- patch_file: "patches/0003-cpp20-compat-alloc.patch"
patch_description: "C++20 compatibility: remove usage of std::allocator<T>::construct & destroy"
patch_type: "portability"
Loading

0 comments on commit 38ae28b

Please sign in to comment.