ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-11-12 15:55:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Only set package_id:confs for sanitized builds (#2261)

Browse Source
This commit is contained in:
Ayaz Salikhov
2025-06-30 13:15:28 +01:00
committed by GitHub
parent 9bee023105
commit 24e1aa9ae5
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/ci/conan/clang.profile
View File

@@ -8,4 +8,4 @@ compiler.version=16
os=Linux os=Linux
[conf] [conf]
tools.build:compiler_executables={'c': '/usr/bin/clang-16', 'cpp': '/usr/bin/clang++-16'} tools.build:compiler_executables={"c": "/usr/bin/clang-16", "cpp": "/usr/bin/clang++-16"}

2
docker/ci/conan/gcc.profile
View File

@@ -8,4 +8,4 @@ compiler.version=12
os=Linux os=Linux
[conf] [conf]
tools.build:compiler_executables={'c': '/usr/bin/gcc-12', 'cpp': '/usr/bin/g++-12'} tools.build:compiler_executables={"c": "/usr/bin/gcc-12", "cpp": "/usr/bin/g++-12"}

1
docker/ci/conan/global.conf
View File

@@ -1,3 +1,2 @@
core.download:parallel={{os.cpu_count()}} core.download:parallel={{os.cpu_count()}}
core.upload:parallel={{os.cpu_count()}} core.upload:parallel={{os.cpu_count()}}
tools.info.package_id:confs = ["tools.build:cflags", "tools.build:cxxflags", "tools.build:exelinkflags", "tools.build:sharedlinkflags"]

17
docker/ci/conan/sanitizer_template.profile
View File

@@ -1,7 +1,8 @@
{% set compiler, sani = profile_name.split('.') %} {% set compiler, sani = profile_name.split('.') %}
{% set sanitizer_opt_map = {'asan': 'address', 'tsan': 'thread', 'ubsan': 'undefined'} %} {% set sanitizer_opt_map = {"asan": "address", "tsan": "thread", "ubsan": "undefined"} %}
{% set sanitizer = sanitizer_opt_map[sani] %} {% set sanitizer = sanitizer_opt_map[sani] %}
{% set sanitizer_build_flags_str = "-fsanitize=" ~ sanitizer ~ " -g -O1 -fno-omit-frame-pointer" %} {% set sanitizer_build_flags_str = "-fsanitize=" ~ sanitizer ~ " -g -O1 -fno-omit-frame-pointer" %}
{% set sanitizer_build_flags = sanitizer_build_flags_str.split(' ') %} {% set sanitizer_build_flags = sanitizer_build_flags_str.split(' ') %}
{% set sanitizer_link_flags_str = "-fsanitize=" ~ sanitizer %} {% set sanitizer_link_flags_str = "-fsanitize=" ~ sanitizer %}
@@ -10,11 +11,13 @@
include({{ compiler }}) include({{ compiler }})
[options] [options]
boost/*:extra_b2_flags = "cxxflags=\"{{ sanitizer_build_flags_str }}\" linkflags=\"{{ sanitizer_link_flags_str }}\"" boost/*:extra_b2_flags="cxxflags=\"{{ sanitizer_build_flags_str }}\" linkflags=\"{{ sanitizer_link_flags_str }}\""
boost/*:without_stacktrace = True boost/*:without_stacktrace=True
[conf] [conf]
tools.build:cflags += {{ sanitizer_build_flags }} tools.build:cflags+={{ sanitizer_build_flags }}
tools.build:cxxflags += {{ sanitizer_build_flags }} tools.build:cxxflags+={{ sanitizer_build_flags }}
tools.build:exelinkflags += {{ sanitizer_link_flags }} tools.build:exelinkflags+={{ sanitizer_link_flags }}
tools.build:sharedlinkflags += {{ sanitizer_link_flags }} tools.build:sharedlinkflags+={{ sanitizer_link_flags }}
tools.info.package_id:confs+=["tools.build:cflags", "tools.build:cxxflags", "tools.build:exelinkflags", "tools.build:sharedlinkflags"]

5
docs/build-clio.md
View File

@@ -64,7 +64,7 @@ compiler.version=12
os=Linux os=Linux
[conf] [conf]
tools.build:compiler_executables={'c': '/usr/bin/gcc-12', 'cpp': '/usr/bin/g++-12'} tools.build:compiler_executables={"c": "/usr/bin/gcc-12", "cpp": "/usr/bin/g++-12"}
``` ```
> [!NOTE] > [!NOTE]
@@ -72,12 +72,11 @@ tools.build:compiler_executables={'c': '/usr/bin/gcc-12', 'cpp': '/usr/bin/g++-1
#### global.conf file #### global.conf file
Add the following to the `~/.conan2/global.conf` file: To increase the speed of downloading and uploading packages, add the following to the `~/.conan2/global.conf` file:
```text ```text
core.download:parallel={{os.cpu_count()}} core.download:parallel={{os.cpu_count()}}
core.upload:parallel={{os.cpu_count()}} core.upload:parallel={{os.cpu_count()}}
tools.info.package_id:confs = ["tools.build:cflags", "tools.build:cxxflags", "tools.build:exelinkflags", "tools.build:sharedlinkflags"]
``` ```
#### Artifactory #### Artifactory