Merge branch 'master' into bayestyper

bioconda · Nov 12, 2024 · 140b364 · 140b364
2 parents fdc6835 + 543f722
commit 140b364
Show file tree

Hide file tree

Showing 17 changed files with 4 additions and 3,514 deletions.
diff --git a/recipes/regenie/build.sh b/recipes/regenie/build.sh
@@ -25,7 +25,7 @@ cmake \
   -S "${SRC_DIR}" \
   -B build
 
-make  -C build -j1 regenie
-make  -C build install
+cmake --build build --target install -j "${CPU_COUNT}"
 
-# bash test/test_conda.sh --path "${SRC_DIR}"
+#make  -C build -j1 regenie
+#make  -C build install
diff --git a/recipes/regenie/build_failure.osx-64.yaml b/recipes/regenie/build_failure.osx-64.yaml
diff --git a/recipes/regenie/meta.yaml b/recipes/regenie/meta.yaml
@@ -11,24 +11,10 @@ source:
   sha256: {{ sha256 }}
   patches:
     # Fixing postrelease issues
-    # - patches/0001-use-shared-cxxopts.patch
-    # - patches/0002-import-shared-Eigen3.patch
-    # - patches/0003-use-conda-cmakelists.patch
-    # - patches/0004-fix-fail-exit-on-help.patch
-    # - patches/0005-use-conda-cmakelist-file.patch
-    # - patches/0006-fix-cmakelist-file.patch
-    # - patches/0007-fix-cmakelist-file-for-osx.patch
-    # - patches/0008-fix-cmakelist-file-for-osx-eigen4.patch
-    # - patches/0009-update-cmake-file-for-conda.patch
-    # - patches/0010-update-cmakelist-file-for-v3.2.7.patch
-    # - patches/0011-update-cmakelist-file-for-v3.2.9.patch
-    # - patches/0012-update-cmakelist-file-for-v3.4.patch
-    # - patches/0013-update-cmakelist-file-for-v3.4.1.patch
-    # - patches/0014-update-cmakelist.txt-for-v3.5.patch
     - patches/0015-update-cmakelist.txt-for-v3.6.patch
 
 build:
-  number: 0
+  number: 1
   run_exports:
     - {{ pin_subpackage('regenie', max_pin="x") }}
 

diff --git a/recipes/regenie/patches/0001-use-shared-cxxopts.patch b/recipes/regenie/patches/0001-use-shared-cxxopts.patch
diff --git a/recipes/regenie/patches/0002-import-shared-Eigen3.patch b/recipes/regenie/patches/0002-import-shared-Eigen3.patch
diff --git a/recipes/regenie/patches/0003-use-conda-cmakelists.patch b/recipes/regenie/patches/0003-use-conda-cmakelists.patch
diff --git a/recipes/regenie/patches/0004-fix-fail-exit-on-help.patch b/recipes/regenie/patches/0004-fix-fail-exit-on-help.patch