Merge pull request #78 from h-vetinari/no_cdt_name

remove wrapper output that's using cdt_name
conda-forge · Oct 22, 2024 · 9a37264 · 9a37264
2 parents 6a06162 + b9051a6
commit 9a37264
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 55 deletions.
diff --git a/...inux_64_centos_machineaarch64cross_target_platformlinux-aarch64target_machineaarch64.yaml b/...inux_64_centos_machineaarch64cross_target_platformlinux-aarch64target_machineaarch64.yaml
@@ -12,14 +12,9 @@ ctng_vendor:
 - conda
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
-sysroot_cdt_arch:
-- aarch64
-sysroot_cdt_name:
-- conda_2_28
 target_machine:
 - aarch64
 zip_keys:
 - - target_machine
   - cross_target_platform
   - centos_machine
-  - sysroot_cdt_arch
diff --git a/..._64_centos_machineppc64lecross_target_platformlinux-ppc64letarget_machinepowerpc64le.yaml b/..._64_centos_machineppc64lecross_target_platformlinux-ppc64letarget_machinepowerpc64le.yaml
@@ -12,14 +12,9 @@ ctng_vendor:
 - conda
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
-sysroot_cdt_arch:
-- ppc64le
-sysroot_cdt_name:
-- conda_2_28
 target_machine:
 - powerpc64le
 zip_keys:
 - - target_machine
   - cross_target_platform
   - centos_machine
-  - sysroot_cdt_arch
diff --git a/...port/linux_64_centos_machines390xcross_target_platformlinux-s390xtarget_machines390x.yaml b/...port/linux_64_centos_machines390xcross_target_platformlinux-s390xtarget_machines390x.yaml
@@ -12,14 +12,9 @@ ctng_vendor:
 - conda
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
-sysroot_cdt_arch:
-- s390x
-sysroot_cdt_name:
-- conda_2_28
 target_machine:
 - s390x
 zip_keys:
 - - target_machine
   - cross_target_platform
   - centos_machine
-  - sysroot_cdt_arch
diff --git a/...pport/linux_64_centos_machinex86_64cross_target_platformlinux-64target_machinex86_64.yaml b/...pport/linux_64_centos_machinex86_64cross_target_platformlinux-64target_machinex86_64.yaml
@@ -12,14 +12,9 @@ ctng_vendor:
 - conda
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
-sysroot_cdt_arch:
-- x86_64
-sysroot_cdt_name:
-- conda_2_28
 target_machine:
 - x86_64
 zip_keys:
 - - target_machine
   - cross_target_platform
   - centos_machine
-  - sysroot_cdt_arch
diff --git a/README.md b/README.md
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -13,19 +13,11 @@ cross_target_platform:
   - linux-aarch64
   - linux-ppc64le
   - linux-s390x
-sysroot_cdt_arch:
-  - x86_64
-  - aarch64
-  - ppc64le
-  - s390x
 
 ctng_vendor:
   - conda
-sysroot_cdt_name:
-  - conda_2_28
 
 zip_keys:
   - - target_machine
     - cross_target_platform
     - centos_machine
-    - sysroot_cdt_arch
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -145,26 +145,6 @@ outputs:
         - find "${PREFIX}" \( -name 'libnsl*' -o -path '*/rpcsvc/yp*' \) | { ! grep . ; }
         - find "${PREFIX}" \( -name 'libcrypt*' -o -name 'crypt.*' \) | { ! grep . ; }
 
-  - name: sysroot-{{ sysroot_cdt_name }}-{{ sysroot_cdt_arch }}
-    build:
-      noarch: generic
-    requirements:
-      run:
-        - sysroot_{{ cross_target_platform }} =={{ version }}
-    test:
-      commands:
-        - test -f $PREFIX/{{ target_machine }}-conda-linux-gnu/sysroot/lib/libc.so.6
-        - test -f $PREFIX/{{ target_machine }}-conda-linux-gnu/sysroot/sbin/ldconfig
-        - test -f $PREFIX/{{ target_machine }}-conda-linux-gnu/sysroot/usr/lib/crt1.o
-        - test -f $PREFIX/{{ target_machine }}-conda-linux-gnu/sysroot/usr/include/limits.h
-        - test -f $PREFIX/{{ target_machine }}-conda-linux-gnu/sysroot/usr/include/gnu/stubs-64.h  # [cross_target_platform == "linux-64"]
-        - test -f $PREFIX/{{ target_machine }}-conda-linux-gnu/sysroot/usr/include/gnu/stubs.h  # [cross_target_platform != "linux-64"]
-        - test -d $PREFIX/{{ target_machine }}-conda-linux-gnu/sysroot/usr/share/locale
-        - test -f $PREFIX/{{ target_machine }}-conda-linux-gnu/sysroot/usr/bin/ldd
-        - test -f $PREFIX/{{ target_machine }}-{{ ctng_vendor }}-linux-gnu/sysroot/lib/libc.so.6
-        - find "${PREFIX}" \( -name 'libnsl*' -o -path '*/rpcsvc/yp*' \) | { ! grep . ; }
-        - find "${PREFIX}" \( -name 'libcrypt*' -o -name 'crypt.*' \) | { ! grep . ; }
-
 about:
   home: https://repo.almalinux.org/vault/8.7
   license: LGPL-2.0-or-later AND LGPL-2.0-or-later WITH exceptions AND GPL-2.0-or-later AND MPL-2.0