Skip to content

Commit

Permalink
Update spaln to 3.0.6 (#47896)
Browse files Browse the repository at this point in the history
* Update spaln to 3.0.5

* Update spaln to 3.0.6

* edit patches

* skip osx for now

---------

Co-authored-by: Joshua Zhuang <[email protected]>
Co-authored-by: mencian <[email protected]>
  • Loading branch information
3 people authored Sep 3, 2024
1 parent e542a72 commit b7f3f0e
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 23 deletions.
9 changes: 5 additions & 4 deletions recipes/spaln/makefile.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/src/Makefile.in b/src/Makefile.in
index ed5cb96..2d837d0 100644
index 7e0ab8d..bd09001 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,19 +1,19 @@
@@ -1,20 +1,20 @@
# Makefile.in for splan/sortgrcd
# Copyright(c) Osamu Gotoh <<[email protected]>>

Expand All @@ -14,9 +14,10 @@ index ed5cb96..2d837d0 100644
+table_dir = $(PREFIX)/share/spaln/table
+alndbs_dir = $(PREFIX)/share/spaln/alndbs
+CXX = $(CXX)
#CXX = clang++
# for MACOS uncomment below line
#CXX = clang++ -std=c++11
-CFLAGS = -O3 -march=native
+CFLAGS += -O3
+CFLAGS = -O3
RANLIB = ranlib
-LD = g++
+LD = $(CXX)
Expand Down
7 changes: 5 additions & 2 deletions recipes/spaln/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set name = "spaln" %}
{% set version = "3.0.4" %}
{% set sha256 = "6001a901e2e1ea5dbf19f34ee18b61ebd9afaf3a3c5107f937dd13e9b63ea870" %}
{% set version = "3.0.6" %}
{% set sha256 = "0b627609b69e0e1487cbb75ff564cfe3816c24da8552acbaf50bf19bce1c6490" %}

package:
name: {{ name|lower }}
Expand All @@ -16,6 +16,7 @@ source:

build:
number: 0
skip: True # [osx]
run_exports:
- {{ pin_subpackage('spaln', max_pin="x") }}

Expand Down Expand Up @@ -58,3 +59,5 @@ extra:
- doi:10.1093/nar/gks708
- doi:10.1093/bioinformatics/btl067
- usegalaxy-eu:spaln
additional-platforms:
- linux-aarch64
25 changes: 8 additions & 17 deletions recipes/spaln/patch-makefile_ldflags
Original file line number Diff line number Diff line change
@@ -1,31 +1,22 @@
diff --git a/src/Makefile.in b/src/Makefile.in
index 7e0ab8d..f6c7256 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -23,8 +23,9 @@ PROG_F = fitild compild decompild plotild
PROG = $(PROG_B) $(PROG_A) $(PROG_F)

STDH = stdtype.h
-CLIB = clib.a -lpthread -lm -lz
+CLIB = clib.a
SLIB = sblib.a $(CLIB)
+LLIB = -lpthread -lm -lz
ULIB = ublib.a $(SLIB)

BINDIR = $(DESTDIR)$(exec_prefix)
@@ -88,13 +89,13 @@ ls:
@@ -95,13 +95,13 @@ ls:
ls $(SRC) $(HDR)

spaln: spaln.cc blksrc.o $(SLIB)
- $(CXX) -o $@ spaln.cc blksrc.o $(SLIB) $(ILIB)
- $(CXX) -o $@ spaln.cc blksrc.o $(SLIB) $(LLIB)
+ $(CXX) $(LDFLAGS) -o $@ spaln.cc blksrc.o $(SLIB) $(LLIB)
sortgrcd: sortgrcd.cc $(SLIB)
- $(CXX) -o $@ sortgrcd.cc $(SLIB) $(ILIB)
- $(CXX) -o $@ sortgrcd.cc $(SLIB) $(LLIB)
+ $(CXX) $(LDFLAGS) -o $@ sortgrcd.cc $(SLIB) $(LLIB)
makdbs: makdbs.cc dbs.h seq.h bitpat.h $(SLIB)
- $(CXX) -o $@ makdbs.cc $(SLIB) $(ILIB)
- $(CXX) -o $@ makdbs.cc $(SLIB) $(LLIB)
+ $(CXX) $(LDFLAGS) -o $@ makdbs.cc $(SLIB) $(LLIB)
makmdm: makmdm.cc mdm.h $(CLIB)
- $(CXX) -o $@ makmdm.cc $(CLIB) $(ILIB)
- $(CXX) -o $@ makmdm.cc $(CLIB) $(LLIB)
+ $(CXX) $(LDFLAGS) -o $@ makmdm.cc $(CLIB) $(LLIB)

dvn: dvn.cc autocomp.h $(ULIB)
$(CXX) -o $@ dvn.cc $(ULIB) $(ILIB)
$(CXX) -o $@ dvn.cc $(ULIB) $(LLIB)

0 comments on commit b7f3f0e

Please sign in to comment.