Merge pull request #117 from traversaro/fixreloc

Fix non-relocatability of sdformat
conda-forge · May 14, 2024 · 8a368a8 · 8a368a8
2 parents 991f145 + 97890cd
commit 8a368a8
Show file tree

Hide file tree

Showing 17 changed files with 442 additions and 34 deletions.
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -2,10 +2,6 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
-c_stdlib:
-- sysroot
-c_stdlib_version:
-- '2.12'
 cdt_name:
 - cos6
 channel_sources:
@@ -40,5 +36,3 @@ urdfdom:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-- - c_stdlib_version
-  - cdt_name
diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -4,10 +4,6 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
-c_stdlib:
-- sysroot
-c_stdlib_version:
-- '2.17'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -44,5 +40,3 @@ urdfdom:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-- - c_stdlib_version
-  - cdt_name
diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -2,10 +2,6 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
-c_stdlib:
-- sysroot
-c_stdlib_version:
-- '2.17'
 cdt_name:
 - cos7
 channel_sources:
@@ -40,5 +36,3 @@ urdfdom:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-- - c_stdlib_version
-  - cdt_name
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -1,13 +1,9 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
 c_compiler:
 - clang
 c_compiler_version:
 - '16'
-c_stdlib:
-- macosx_deployment_target
-c_stdlib_version:
-- '10.9'
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -4,10 +4,6 @@ c_compiler:
 - clang
 c_compiler_version:
 - '16'
-c_stdlib:
-- macosx_deployment_target
-c_stdlib_version:
-- '11.0'
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -1,7 +1,5 @@
 c_compiler:
 - vs2019
-c_stdlib:
-- vs
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -17,3 +17,4 @@ provider:
   linux_aarch64: default
   linux_ppc64le: default
 test: native_and_emulated
+conda_build_tool: conda-build+classic