From 40c93d1f43c5ec676ad2526f2d86a73571c0ea9a Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Mon, 23 Dec 2024 10:52:03 +0200 Subject: [PATCH 1/5] phasius: Update to 0.2.0 and add linux-aarch64 build Signed-off-by: Martin Tzvetanov Grigorov --- recipes/phasius/build.sh | 11 ++++++----- recipes/phasius/meta.yaml | 23 ++++++++++++++++------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/recipes/phasius/build.sh b/recipes/phasius/build.sh index 5a793a00131c7..77140d141162d 100644 --- a/recipes/phasius/build.sh +++ b/recipes/phasius/build.sh @@ -1,11 +1,12 @@ -#!/bin/bash -euo +#!/bin/bash + +set -xeuo + export CFLAGS="${CFLAGS} -fcommon" export CXXFLAGS="${CFLAGS} -fcommon" -# Add workaround for SSH-based Git connections from Rust/cargo. See https://github.com/rust-lang/cargo/issues/2078 for details. -# We set CARGO_HOME because we don't pass on HOME to conda-build, thus rendering the default "${HOME}/.cargo" defunct. -export CARGO_NET_GIT_FETCH_WITH_CLI=true CARGO_HOME="$(pwd)/.cargo" +cargo-bundle-licenses --format yaml --output THIRDPARTY.yml # build statically linked binary with Rust export LD=$CC -C_INCLUDE_PATH=$PREFIX/include LIBRARY_PATH=$PREFIX/lib RUST_BACKTRACE=1 cargo install --verbose --root $PREFIX --path . +C_INCLUDE_PATH=$PREFIX/include LIBRARY_PATH=$PREFIX/lib RUST_BACKTRACE=1 cargo install --verbose --root $PREFIX --path . --no-track diff --git a/recipes/phasius/meta.yaml b/recipes/phasius/meta.yaml index df5ed3ec03c3e..9232b5517ddae 100644 --- a/recipes/phasius/meta.yaml +++ b/recipes/phasius/meta.yaml @@ -1,26 +1,29 @@ -{% set version = "0.1.0" %} +{% set name = "phasius" %} +{% set version = "0.2.0" %} package: - name: phasius + name: {{ name }} version: {{ version }} build: - number: 2 + number: 3 skip: true # [osx] -# script: cargo install --path . --root ${PREFIX} + run_exports: + - {{ pin_subpackage(name, max_pin='x.x') }} source: url: https://github.com/wdecoster/phasius/archive/v{{ version }}d.tar.gz - sha256: fc210f31c06f5437264cabff9be785e708a293f945b9e865c2bd964fdb61f9c7 + sha256: a5b320303383b473661fccf7ec93f3b555b21d86d78d9cdaf5317cc9bcf3cb0e requirements: build: - - rust >=1.60 - autoconf - make + - {{ compiler('rust') }} - {{ compiler('cxx') }} - pkg-config - cmake + - cargo-bundle-licenses host: run: @@ -31,6 +34,12 @@ test: about: home: https://github.com/wdecoster/phasius - license: MIT + license: + - MIT + - THIRDPARTY.yml license_file: LICENSE summary: A rust tool to create phase-block maps from phased cram/bam files + +extra: + additional-platforms: + - linux-aarch64 \ No newline at end of file From 45f4eebe76c9fa1b2190a72a51308258ace5b882 Mon Sep 17 00:00:00 2001 From: Martin Grigorov Date: Mon, 23 Dec 2024 10:58:46 +0200 Subject: [PATCH 2/5] Reset the build number --- recipes/phasius/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/phasius/meta.yaml b/recipes/phasius/meta.yaml index 9232b5517ddae..3b1b9caa9ff05 100644 --- a/recipes/phasius/meta.yaml +++ b/recipes/phasius/meta.yaml @@ -6,7 +6,7 @@ package: version: {{ version }} build: - number: 3 + number: 0 skip: true # [osx] run_exports: - {{ pin_subpackage(name, max_pin='x.x') }} From efd3e1619576a96bfd21a45ebce12aae899d3d3f Mon Sep 17 00:00:00 2001 From: Martin Grigorov Date: Mon, 23 Dec 2024 11:11:59 +0200 Subject: [PATCH 3/5] Fix the license files --- recipes/phasius/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/phasius/meta.yaml b/recipes/phasius/meta.yaml index 3b1b9caa9ff05..81a1fe3d9d20a 100644 --- a/recipes/phasius/meta.yaml +++ b/recipes/phasius/meta.yaml @@ -34,12 +34,12 @@ test: about: home: https://github.com/wdecoster/phasius - license: - - MIT + license: MIT + license_file: + - LICENSE - THIRDPARTY.yml - license_file: LICENSE summary: A rust tool to create phase-block maps from phased cram/bam files extra: additional-platforms: - - linux-aarch64 \ No newline at end of file + - linux-aarch64 From ebf74f4a3d3cd05d2a1d1e9d15fa4761c8fdbdf6 Mon Sep 17 00:00:00 2001 From: Martin Grigorov Date: Mon, 23 Dec 2024 11:21:51 +0200 Subject: [PATCH 4/5] Update the download link --- recipes/phasius/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/phasius/meta.yaml b/recipes/phasius/meta.yaml index 81a1fe3d9d20a..e07824fcdd68c 100644 --- a/recipes/phasius/meta.yaml +++ b/recipes/phasius/meta.yaml @@ -12,7 +12,7 @@ build: - {{ pin_subpackage(name, max_pin='x.x') }} source: - url: https://github.com/wdecoster/phasius/archive/v{{ version }}d.tar.gz + url: https://github.com/wdecoster/phasius/archive/refs/tags/v{{ version }}.tar.gz sha256: a5b320303383b473661fccf7ec93f3b555b21d86d78d9cdaf5317cc9bcf3cb0e requirements: From 2d2147384d6d790495f012007fb4aa2002d21885 Mon Sep 17 00:00:00 2001 From: Martin Grigorov Date: Mon, 23 Dec 2024 11:32:19 +0200 Subject: [PATCH 5/5] Add clangdev as a build dependency --- recipes/phasius/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/phasius/meta.yaml b/recipes/phasius/meta.yaml index e07824fcdd68c..8fe83284a2ef4 100644 --- a/recipes/phasius/meta.yaml +++ b/recipes/phasius/meta.yaml @@ -24,6 +24,7 @@ requirements: - pkg-config - cmake - cargo-bundle-licenses + - clangdev host: run: