Merge pull request #1 from AnacondaRecipes/PKG-4709-12.4-initial

Pkg 4709 12.4 initial
AnacondaRecipes · May 13, 2024 · 394d58b · 394d58b
2 parents e1e108a + d96e69a
commit 394d58b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -17,7 +17,7 @@ for i in `ls`; do
             [[ -d $PREFIX/$i/$j ]] && continue
             [[ $j == "compute-sanitizer" ]] && continue
 
-            patchelf --set-rpath '$ORIGIN/../lib' $PREFIX/$i/$j
+            patchelf --set-rpath '$ORIGIN/../lib' --force-rpath $PREFIX/$i/$j
         done
     fi
 done
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -1,2 +1,5 @@
 arm_variant_type: # [aarch64]
   - sbsa          # [aarch64]
+conda_glibc_ver:
+  - 2.17          # [not aarch64]
+  - 2.26          # [aarch64]
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -24,7 +24,7 @@ source:
 build:
   number: 1
   binary_relocation: false
-  skip: true  # [osx]
+  skip: true  # [osx or (linux and s390x)]
   missing_dso_whitelist:
     - '$RPATH/libInterceptorInjectionTarget.so'  # [linux]
     - '$RPATH/InterceptorInjectionTarget.dll'    # [win]
@@ -33,8 +33,8 @@ requirements:
   build:
     - {{ compiler("c") }}
     - {{ compiler("cxx") }}
-    - sysroot_{{ target_platform }} 2.17    # [linux]
-    - arm-variant * {{ arm_variant_type }}  # [aarch64]
+    - sysroot_{{ target_platform }} {{ conda_glibc_ver }}.*    # [linux]
+    #- arm-variant * {{ arm_variant_type }}  # [aarch64]
     - patchelf <0.18.0                      # [linux]
   host:
     - cuda-version {{ cuda_version }}
@@ -49,7 +49,11 @@ test:
     - test -f $PREFIX/compute-sanitizer/compute-sanitizer                           # [linux]
     - if not exist %LIBRARY_PREFIX%\compute-sanitizer\compute-sanitizer.exe exit 1  # [win]
     - if not exist %PREFIX%\Scripts\compute-sanitizer.bat exit 1                    # [win]
-    - {{ exists }} compute-sanitizer
+    # This test fails on aarch64. Using `strace which compute-sanitizer` confirms the file is found, but
+    # which still writes "no compute-sanitizer" to stderr. Maybe the `which` in our docker container isn't working correctly, because
+    # `compute-sanitizer --version` executes correctly, and there's no system CUDA installation in the container.
+    # renaming compute-sanitizer to 14 characters or less also seems to fix it.
+    - {{ exists }} compute-sanitizer                                                # [not (linux and aarch64)]
     - compute-sanitizer --version                                                   # [build_platform == target_platform]
 
 about: