From dbd0c2b560355d1afb5fb117cd1c13bc636572de Mon Sep 17 00:00:00 2001 From: David Lecomber Date: Wed, 13 Nov 2024 12:20:20 +0000 Subject: [PATCH 1/8] Add osx-arm64 to r-facets, r-spp --- recipes/r-facets/meta.yaml | 3 ++- recipes/r-spp/meta.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes/r-facets/meta.yaml b/recipes/r-facets/meta.yaml index 4bbd9aa678bdd..f0ea43f0f9c9d 100644 --- a/recipes/r-facets/meta.yaml +++ b/recipes/r-facets/meta.yaml @@ -7,7 +7,7 @@ source: sha256: aa671d4fc66e10ce2fe4c8b2cbac4946da8a1564627240ea916db6cd8ec2a6c5 build: - number: 5 + number: 6 run_exports: - {{ pin_subpackage("r-facets", max_pin="x") }} rpaths: @@ -39,5 +39,6 @@ about: extra: additional-platforms: - linux-aarch64 + - osx-arm64 identifiers: - biotools:facets diff --git a/recipes/r-spp/meta.yaml b/recipes/r-spp/meta.yaml index f75be8dc297b9..f372bfd50fba2 100644 --- a/recipes/r-spp/meta.yaml +++ b/recipes/r-spp/meta.yaml @@ -11,7 +11,7 @@ source: sha256: 3c890f3c414183167f9643b556621dcdc14ce6a1b54a04d618c74070fdebfd23 build: - number: 10 + number: 11 run_exports: - {{ pin_subpackage("r-spp", max_pin="x") }} rpaths: @@ -52,6 +52,7 @@ about: extra: additional-platforms: - linux-aarch64 + - osx-arm64 identifiers: - biotools:spp - doi:10.1038/nbt.1508 From 804d19114ed9e706b44ef45c82a220c2a110d134 Mon Sep 17 00:00:00 2001 From: David Lecomber Date: Wed, 13 Nov 2024 13:36:54 +0000 Subject: [PATCH 2/8] Add bioconductor-rsamtools osx-arm64 support - is a dependency for r-spp --- recipes/bioconductor-rsamtools/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/bioconductor-rsamtools/meta.yaml b/recipes/bioconductor-rsamtools/meta.yaml index 55489dfd108c5..cde6ba1e65d5c 100644 --- a/recipes/bioconductor-rsamtools/meta.yaml +++ b/recipes/bioconductor-rsamtools/meta.yaml @@ -13,7 +13,7 @@ source: - 'https://depot.galaxyproject.org/software/bioconductor-{{ name|lower }}/bioconductor-{{ name|lower }}_{{ version }}_src_all.tar.gz' md5: 63af2a7dd2513e992fd78b26ca2b3775 build: - number: 2 + number: 3 rpaths: - lib/R/lib/ - lib/ @@ -66,6 +66,7 @@ about: extra: additional-platforms: - linux-aarch64 + - osx-arm64 identifiers: - biotools:rsamtools - doi:10.1038/nmeth.3252 From 62e6502b37dbe9fc0504f5124ca5047a049ef05d Mon Sep 17 00:00:00 2001 From: David Lecomber Date: Wed, 13 Nov 2024 14:14:15 +0000 Subject: [PATCH 3/8] Revert attempt to include r-spp and bioconductor-rsamtools due to excessive dependencies to build for osx-arm64 --- recipes/bioconductor-rsamtools/meta.yaml | 3 +-- recipes/r-spp/meta.yaml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes/bioconductor-rsamtools/meta.yaml b/recipes/bioconductor-rsamtools/meta.yaml index cde6ba1e65d5c..55489dfd108c5 100644 --- a/recipes/bioconductor-rsamtools/meta.yaml +++ b/recipes/bioconductor-rsamtools/meta.yaml @@ -13,7 +13,7 @@ source: - 'https://depot.galaxyproject.org/software/bioconductor-{{ name|lower }}/bioconductor-{{ name|lower }}_{{ version }}_src_all.tar.gz' md5: 63af2a7dd2513e992fd78b26ca2b3775 build: - number: 3 + number: 2 rpaths: - lib/R/lib/ - lib/ @@ -66,7 +66,6 @@ about: extra: additional-platforms: - linux-aarch64 - - osx-arm64 identifiers: - biotools:rsamtools - doi:10.1038/nmeth.3252 diff --git a/recipes/r-spp/meta.yaml b/recipes/r-spp/meta.yaml index f372bfd50fba2..f75be8dc297b9 100644 --- a/recipes/r-spp/meta.yaml +++ b/recipes/r-spp/meta.yaml @@ -11,7 +11,7 @@ source: sha256: 3c890f3c414183167f9643b556621dcdc14ce6a1b54a04d618c74070fdebfd23 build: - number: 11 + number: 10 run_exports: - {{ pin_subpackage("r-spp", max_pin="x") }} rpaths: @@ -52,7 +52,6 @@ about: extra: additional-platforms: - linux-aarch64 - - osx-arm64 identifiers: - biotools:spp - doi:10.1038/nbt.1508 From 80b6353e5ec12168bbd5e37f43f4b2a6ef951fe2 Mon Sep 17 00:00:00 2001 From: David Lecomber Date: Sun, 17 Nov 2024 17:31:16 +0000 Subject: [PATCH 4/8] Add linux-aarch64 and osx-arm64 to perl-io-compress and blast. --- recipes/blast/meta.yaml | 11 ++++------- recipes/perl-io-compress/meta.yaml | 10 ++++++++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/recipes/blast/meta.yaml b/recipes/blast/meta.yaml index da0a582f155e8..722266f2d146f 100644 --- a/recipes/blast/meta.yaml +++ b/recipes/blast/meta.yaml @@ -16,7 +16,7 @@ source: - update_configsub.patch build: - number: 2 + number: 3 run_exports: # Now, the point releases seem to be only bugfixes at least (but this definitely was not the # case up to v2.2.31) @@ -96,12 +96,9 @@ about: extra: - # this can be enabled once: - # perl-list-moreutils-xs, perl-io-compress - # have ARM builds available - #additional-platforms: - # - linux-aarch64 - # - osx-arm64 + additional-platforms: + - linux-aarch64 + - osx-arm64 identifiers: - biotools:blast - doi:10.1016/S0022-2836(05)80360-2 diff --git a/recipes/perl-io-compress/meta.yaml b/recipes/perl-io-compress/meta.yaml index 8622771c8e1e5..b557835512030 100644 --- a/recipes/perl-io-compress/meta.yaml +++ b/recipes/perl-io-compress/meta.yaml @@ -7,8 +7,10 @@ source: sha256: f6c55c4e39cfaa3219965dd3b36c9de1edee9a82a10a9cadeb3b74a9ceeeaaad build: - number: 2 - + number: 3 + run_exports: + - {{ pin_subpackage('bedtools', max_pin="x") }} + requirements: build: - make @@ -55,6 +57,10 @@ test: - IO::Uncompress::RawInflate - IO::Uncompress::Unzip +extra: + additional-platforms: + - linux-aarch64 + - osx-arm64 about: home: http://metacpan.org/pod/IO-Compress license: perl_5 From cdbf202b5484d165029249ccd3ad9fb24123fbfb Mon Sep 17 00:00:00 2001 From: David Lecomber Date: Sun, 17 Nov 2024 17:41:33 +0000 Subject: [PATCH 5/8] Oops - cut and pasta error --- recipes/perl-io-compress/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/perl-io-compress/meta.yaml b/recipes/perl-io-compress/meta.yaml index b557835512030..6f1c194a842b1 100644 --- a/recipes/perl-io-compress/meta.yaml +++ b/recipes/perl-io-compress/meta.yaml @@ -9,7 +9,7 @@ source: build: number: 3 run_exports: - - {{ pin_subpackage('bedtools', max_pin="x") }} + - {{ pin_subpackage(name, max_pin="x") }} requirements: build: From c2923d80eaf89cffd91eefa56a4664b1f55e41d4 Mon Sep 17 00:00:00 2001 From: David Lecomber Date: Sun, 17 Nov 2024 17:50:32 +0000 Subject: [PATCH 6/8] add name variable to perl-io-compress meta.yaml --- recipes/perl-io-compress/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/perl-io-compress/meta.yaml b/recipes/perl-io-compress/meta.yaml index 6f1c194a842b1..1d3112efea2e4 100644 --- a/recipes/perl-io-compress/meta.yaml +++ b/recipes/perl-io-compress/meta.yaml @@ -1,5 +1,6 @@ +{% set name = "perl-io-compress" %} package: - name: perl-io-compress + name: {{ name }} version: 2.201 source: From fc1b173cc9837f246fc5fa115b26ae6383adb836 Mon Sep 17 00:00:00 2001 From: David Lecomber Date: Sun, 17 Nov 2024 18:03:55 +0000 Subject: [PATCH 7/8] Remove Blast from this patvh --- recipes/blast/meta.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/recipes/blast/meta.yaml b/recipes/blast/meta.yaml index 722266f2d146f..da0a582f155e8 100644 --- a/recipes/blast/meta.yaml +++ b/recipes/blast/meta.yaml @@ -16,7 +16,7 @@ source: - update_configsub.patch build: - number: 3 + number: 2 run_exports: # Now, the point releases seem to be only bugfixes at least (but this definitely was not the # case up to v2.2.31) @@ -96,9 +96,12 @@ about: extra: - additional-platforms: - - linux-aarch64 - - osx-arm64 + # this can be enabled once: + # perl-list-moreutils-xs, perl-io-compress + # have ARM builds available + #additional-platforms: + # - linux-aarch64 + # - osx-arm64 identifiers: - biotools:blast - doi:10.1016/S0022-2836(05)80360-2 From 3c60e20ca132ccffa196c64c26ac84851c7b42d0 Mon Sep 17 00:00:00 2001 From: dslarm <38504854+dslarm@users.noreply.github.com> Date: Mon, 18 Nov 2024 19:18:02 +0000 Subject: [PATCH 8/8] Update meta.yaml to remove osx-arm64 and show reason --- recipes/perl-io-compress/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/perl-io-compress/meta.yaml b/recipes/perl-io-compress/meta.yaml index 1d3112efea2e4..ec9551d86e261 100644 --- a/recipes/perl-io-compress/meta.yaml +++ b/recipes/perl-io-compress/meta.yaml @@ -61,7 +61,8 @@ test: extra: additional-platforms: - linux-aarch64 - - osx-arm64 + # perl-compress-raw-bzip2 and perl-scalar-list-utils missing + # - osx-arm64 about: home: http://metacpan.org/pod/IO-Compress license: perl_5