From 2c0085d9349f9593f832fdd75be86e1430d5ec5e Mon Sep 17 00:00:00 2001 From: FriederikeHanssen Date: Tue, 29 Oct 2024 14:23:09 +0000 Subject: [PATCH 1/6] patch build.sh --- recipes/spring/build.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/recipes/spring/build.sh b/recipes/spring/build.sh index 08e68971964f4..5ef7049c7586e 100644 --- a/recipes/spring/build.sh +++ b/recipes/spring/build.sh @@ -8,6 +8,12 @@ export CXXPATH=${PREFIX}/include export CFLAGS="$CFLAGS -I$PREFIX/include" export CXXFLAGS="$CFLAGS -I$PREFIX/include" export LDFLAGS="$LDFLAGS -L$PREFIX/lib" -cmake -Dspring_optimize_for_portability=ON .. +if [ $(arch) == aarch64 ]; then + cmake .. + else + cmake -Dspring_optimize_for_portability=ON .. +fi make cp spring $PREFIX/bin + + From 8cf138bd72201525dd86c00681540558907dbe94 Mon Sep 17 00:00:00 2001 From: FriederikeHanssen Date: Wed, 30 Oct 2024 10:42:22 +0000 Subject: [PATCH 2/6] bump build number --- recipes/spring/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/spring/meta.yaml b/recipes/spring/meta.yaml index 3025d74de5bd1..d45cfd61ca5c9 100644 --- a/recipes/spring/meta.yaml +++ b/recipes/spring/meta.yaml @@ -5,7 +5,7 @@ package: version: {{ version }} build: - number: 2 + number: 3 skip: True # [osx] source: From 61d60ae937c5ee84a2a426dbe24a9081268d2cb9 Mon Sep 17 00:00:00 2001 From: Matthias De Smet <11850640+matthdsm@users.noreply.github.com> Date: Wed, 30 Oct 2024 11:44:07 +0100 Subject: [PATCH 3/6] Update recipes/spring/build.sh Drop newlines --- recipes/spring/build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/spring/build.sh b/recipes/spring/build.sh index 5ef7049c7586e..97e810f958ef4 100644 --- a/recipes/spring/build.sh +++ b/recipes/spring/build.sh @@ -15,5 +15,3 @@ if [ $(arch) == aarch64 ]; then fi make cp spring $PREFIX/bin - - From 750c245bc725621e6d3801c5600ca6940daa0e19 Mon Sep 17 00:00:00 2001 From: FriederikeHanssen Date: Wed, 30 Oct 2024 11:33:16 +0000 Subject: [PATCH 4/6] apply review comments --- recipes/spring/Makefile.patch | 23 +++++++++++++++++++++++ recipes/spring/build.sh | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 recipes/spring/Makefile.patch diff --git a/recipes/spring/Makefile.patch b/recipes/spring/Makefile.patch new file mode 100644 index 0000000000000..68c4e799d9dd8 --- /dev/null +++ b/recipes/spring/Makefile.patch @@ -0,0 +1,23 @@ +diff --git a/src/libbsc/bsc.h b/src/libbsc/bsc.h +index 25230dc..caca189 100644 +--- a/src/libbsc/bsc.h ++++ b/src/libbsc/bsc.h +@@ -48,6 +48,7 @@ preprocessor macro LIBBSC_SORT_TRANSFORM_SUPPORT at compile time. + #ifndef SPRING_LIBBSC_BSC_H_ + #define SPRING_LIBBSC_BSC_H_ + ++#include + #include "params.h" + + namespace spring { +diff --git a/src/util.h b/src/util.h +index 30bad68..a72a0b6 100644 +--- a/src/util.h ++++ b/src/util.h +@@ -17,6 +17,7 @@ limitations under the License. + + #include + #include ++#include + + namespace spring { \ No newline at end of file diff --git a/recipes/spring/build.sh b/recipes/spring/build.sh index 5ef7049c7586e..6158dd35de9b4 100644 --- a/recipes/spring/build.sh +++ b/recipes/spring/build.sh @@ -8,7 +8,7 @@ export CXXPATH=${PREFIX}/include export CFLAGS="$CFLAGS -I$PREFIX/include" export CXXFLAGS="$CFLAGS -I$PREFIX/include" export LDFLAGS="$LDFLAGS -L$PREFIX/lib" -if [ $(arch) == aarch64 ]; then +if [ $(arch) == "aarch64" ]; then cmake .. else cmake -Dspring_optimize_for_portability=ON .. From f47b8a217d6ecb261a33dd2e3e84a5c32cc44d72 Mon Sep 17 00:00:00 2001 From: Joshua Zhuang <71105179+mencian@users.noreply.github.com> Date: Wed, 30 Oct 2024 14:29:22 -0500 Subject: [PATCH 5/6] add run_exports --- recipes/spring/meta.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/spring/meta.yaml b/recipes/spring/meta.yaml index d45cfd61ca5c9..48d11ed9e93a0 100644 --- a/recipes/spring/meta.yaml +++ b/recipes/spring/meta.yaml @@ -7,6 +7,8 @@ package: build: number: 3 skip: True # [osx] + run_exports: + - {{ pin_subpackage('spring', max_pin="x") }} source: url: https://github.com/shubhamchandak94/Spring/archive/v{{ version }}.tar.gz @@ -26,5 +28,6 @@ about: home: https://github.com/shubhamchandak94/Spring license: Free for non-commercial use license_file: license.pdf - summary: Spring is a compression tool for Fastq files + summary: "Spring is a compression tool for Fastq files." + dev_url: https://github.com/shubhamchandak94/Spring From 4de67848d62f1b76f7b09989b740f11a7beb72b2 Mon Sep 17 00:00:00 2001 From: Joshua Zhuang <71105179+mencian@users.noreply.github.com> Date: Wed, 30 Oct 2024 14:34:11 -0500 Subject: [PATCH 6/6] add linux-aarch64 build --- recipes/spring/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/spring/meta.yaml b/recipes/spring/meta.yaml index 48d11ed9e93a0..8dac430b3ae51 100644 --- a/recipes/spring/meta.yaml +++ b/recipes/spring/meta.yaml @@ -31,3 +31,6 @@ about: summary: "Spring is a compression tool for Fastq files." dev_url: https://github.com/shubhamchandak94/Spring +extra: + additional-platforms: + - linux-aarch64