Merge pull request #21 from traversaro/patch-1

Fix wrong bz2 dependency in Windows .pc pkg-config file
conda-forge · Nov 13, 2020 · 2f2be18 · 2f2be18 · conda-forge-linter · Nov 13, 2020
2 parents e58e9d7 + 6dba323
commit 2f2be18
Show file tree

Hide file tree

Showing 23 changed files with 253 additions and 275 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_.yaml → .ci_support/linux_64_.yaml b/.ci_support/linux_.yaml → .ci_support/linux_64_.yaml
@@ -4,20 +4,24 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '7'
+cdt_name:
+- cos6
 channel_sources:
 - conda-forge,defaults
 channel_targets:
 - conda-forge main
 docker_image:
 - condaforge/linux-anvil-comp7
 openssl:
-- 1.1.1a
+- 1.1.1
 pin_run_as_build:
  bzip2:
  max_pin: x
  openssl:
  max_pin: x.x.x
  zlib:
  max_pin: x.x
+target_platform:
+- linux-64
 zlib:
 - '1.2'
diff --git a/.ci_support/osx_.yaml → .ci_support/osx_64_.yaml b/.ci_support/osx_.yaml → .ci_support/osx_64_.yaml
@@ -5,23 +5,23 @@ bzip2:
 c_compiler:
 - clang
 c_compiler_version:
-- '4'
+- '10'
 channel_sources:
 - conda-forge,defaults
 channel_targets:
 - conda-forge main
 macos_machine:
 - x86_64-apple-darwin13.4.0
-macos_min_version:
-- '10.9'
 openssl:
-- 1.1.1a
+- 1.1.1
 pin_run_as_build:
  bzip2:
  max_pin: x
  openssl:
  max_pin: x.x.x
  zlib:
  max_pin: x.x
+target_platform:
+- osx-64
 zlib:
 - '1.2'
diff --git a/.ci_support/win_c_compilervs2008.yaml → .ci_support/win_64_.yaml b/.ci_support/win_c_compilervs2008.yaml → .ci_support/win_64_.yaml
@@ -1,19 +1,21 @@
 bzip2:
 - '1'
 c_compiler:
-- vs2008
+- vs2017
 channel_sources:
 - conda-forge,defaults
 channel_targets:
 - conda-forge main
 openssl:
-- 1.1.1a
+- 1.1.1
 pin_run_as_build:
  bzip2:
  max_pin: x
  openssl:
  max_pin: x.x.x
  zlib:
  max_pin: x.x
+target_platform:
+- win-64
 zlib:
 - '1.2'
diff --git a/.ci_support/win_c_compilervs2015.yaml b/.ci_support/win_c_compilervs2015.yaml