Skip to content

Commit 3624c87

Browse files
rongourongou
authored
Merge pull request #61 from jameslamb/update/v1.13.0
spdlog v1.13.0
2 parents 882fa9c + 3af26a5 commit 3624c87

20 files changed

+114
-83
lines changed

‎.azure-pipelines/azure-pipelines-linux.yml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.azure-pipelines/azure-pipelines-osx.yml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.azure-pipelines/azure-pipelines-win.yml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.ci_support/linux_64_.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
c_stdlib:
2+
- sysroot
3+
c_stdlib_version:
4+
- '2.12'
15
cdt_name:
26
- cos6
37
channel_sources:
@@ -14,3 +18,6 @@ fmt:
1418
- '10'
1519
target_platform:
1620
- linux-64
21+
zip_keys:
22+
- - c_stdlib_version
23+
- cdt_name

‎.ci_support/linux_aarch64_.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
BUILD:
22
- aarch64-conda_cos7-linux-gnu
3+
c_stdlib:
4+
- sysroot
5+
c_stdlib_version:
6+
- '2.17'
37
cdt_arch:
48
- aarch64
59
cdt_name:
@@ -18,3 +22,6 @@ fmt:
1822
- '10'
1923
target_platform:
2024
- linux-aarch64
25+
zip_keys:
26+
- - c_stdlib_version
27+
- cdt_name

‎.ci_support/linux_ppc64le_.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
c_stdlib:
2+
- sysroot
3+
c_stdlib_version:
4+
- '2.17'
15
cdt_name:
26
- cos7
37
channel_sources:
@@ -14,3 +18,6 @@ fmt:
1418
- '10'
1519
target_platform:
1620
- linux-ppc64le
21+
zip_keys:
22+
- - c_stdlib_version
23+
- cdt_name

‎.ci_support/migrations/fmt10.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.ci_support/osx_64_.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
MACOSX_DEPLOYMENT_TARGET:
22
- '10.9'
3+
c_stdlib:
4+
- macosx_deployment_target
5+
c_stdlib_version:
6+
- '10.9'
37
channel_sources:
48
- conda-forge
59
channel_targets:

‎.ci_support/osx_arm64_.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
MACOSX_DEPLOYMENT_TARGET:
22
- '11.0'
3+
c_stdlib:
4+
- macosx_deployment_target
5+
c_stdlib_version:
6+
- '11.0'
37
channel_sources:
48
- conda-forge
59
channel_targets:

‎.ci_support/win_64_.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
c_stdlib:
2+
- vs
13
channel_sources:
24
- conda-forge
35
channel_targets:

‎.gitignore

Lines changed: 23 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.scripts/build_steps.sh

Lines changed: 7 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.scripts/run_docker_build.sh

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.scripts/run_osx_build.sh

Lines changed: 11 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.scripts/run_win_build.bat

Lines changed: 13 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build-locally.py

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎recipe/meta.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% set name = "spdlog" %}
2-
{% set version = "1.12.0" %}
3-
{% set sha256 = "4dccf2d10f410c1e2feaff89966bfc49a1abb29ef6f08246335b110e001e09a9" %}
2+
{% set version = "1.13.0" %}
3+
{% set sha256 = "534f2ee1a4dcbeb22249856edfb2be76a1cf4f708a20b0ac2ed090ee24cfdbc9" %}
44

55
package:
66
name: {{ name|lower }}
@@ -11,10 +11,9 @@ source:
1111
sha256: {{ sha256 }}
1212
patches:
1313
- patches/fix.patch
14-
- patches/0001-Match-SPDLOG_CONSTEXPR_FUNC-to-FMT_CONSTEXPR-2901.patch
1514

1615
build:
17-
number: 2
16+
number: 0
1817
run_exports:
1918
- {{ pin_subpackage('spdlog', max_pin='x.x') }}
2019

‎recipe/patches/0001-Match-SPDLOG_CONSTEXPR_FUNC-to-FMT_CONSTEXPR-2901.patch

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)