Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add rdeval #52095

Merged
merged 74 commits into from
Nov 16, 2024
Merged
Show file tree
Hide file tree
Changes from 72 commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
674dcc0
initial attempt
Nov 12, 2024
e33c5e2
adding make as a dependency
Nov 12, 2024
2b072df
new hash
Nov 12, 2024
8231e37
adding test
Nov 12, 2024
f4652bc
fixing build.sh
Nov 12, 2024
2f4e58a
Merge branch 'master' into rdeval
richard-burhans Nov 12, 2024
87296b0
using version with submodules
Nov 12, 2024
9bd1425
adding zlib
Nov 12, 2024
13e7bd6
updates
Nov 12, 2024
ce7037f
update
Nov 12, 2024
b1a6e2b
foo
Nov 12, 2024
303792e
quote
Nov 12, 2024
0ae2fef
u
Nov 12, 2024
2d066a0
Merge branch 'master' into rdeval
richard-burhans Nov 12, 2024
a401dab
a
Nov 12, 2024
5e87326
patch
Nov 12, 2024
de1a4fb
zlib
Nov 12, 2024
2c7164a
zlib
Nov 12, 2024
9ce5806
foo
Nov 12, 2024
b5372a1
clean up recipe
mencian Nov 13, 2024
b061c2d
clean up patches
mencian Nov 13, 2024
7a51e11
Update build.sh
mencian Nov 13, 2024
340e33a
Merge branch 'master' into rdeval
mencian Nov 13, 2024
5155d5c
add gfalibs patch
mencian Nov 13, 2024
68a3123
Update meta.yaml
mencian Nov 13, 2024
a32a8b4
Update meta.yaml
mencian Nov 13, 2024
165854e
add gfalibs patch
mencian Nov 13, 2024
9557f45
edit foo.patch
mencian Nov 13, 2024
e758cf8
Update foo.patch
mencian Nov 13, 2024
7b3e888
edit foo.patch
mencian Nov 13, 2024
8e8c1f1
edit foo.patch
mencian Nov 13, 2024
8434782
Update build.sh
mencian Nov 13, 2024
d483068
makefile
Nov 13, 2024
ae3dc23
Merge branch 'rdeval' of https://github.com/richard-burhans/bioconda-…
Nov 13, 2024
44a2f68
makefile
Nov 13, 2024
1dc56cd
updating submodule makefile
Nov 13, 2024
f9bd8b6
Merge branch 'master' into rdeval
richard-burhans Nov 13, 2024
5af9fd4
bumping build version
Nov 13, 2024
7491e1b
Merge branch 'rdeval' of https://github.com/richard-burhans/bioconda-…
Nov 13, 2024
55f449b
includes
Nov 13, 2024
2857c8d
testing makefile changrs
richard-burhans Nov 14, 2024
5b96de8
make
richard-burhans Nov 14, 2024
0904f68
Merge branch 'master' into rdeval
richard-burhans Nov 14, 2024
46b5350
patches
richard-burhans Nov 14, 2024
8f0bd87
Merge branch 'master' into rdeval
richard-burhans Nov 14, 2024
46e896f
patches
richard-burhans Nov 14, 2024
4b25f44
patches
richard-burhans Nov 14, 2024
d83f06a
Merge branch 'master' into rdeval
richard-burhans Nov 14, 2024
890c1bb
patches
richard-burhans Nov 14, 2024
cfdf3f6
Merge branch 'master' into rdeval
richard-burhans Nov 14, 2024
43f531e
patches
richard-burhans Nov 14, 2024
2798153
forgot reads.patch
richard-burhans Nov 14, 2024
3b136ab
upp
richard-burhans Nov 15, 2024
13f0ca1
Merge branch 'master' into rdeval
richard-burhans Nov 15, 2024
f87fa82
zlib
richard-burhans Nov 15, 2024
f1eb31e
zlib
richard-burhans Nov 15, 2024
6f610cf
Merge branch 'master' into rdeval
richard-burhans Nov 15, 2024
a25ff64
patch
richard-burhans Nov 15, 2024
fe6b226
Merge branch 'master' into rdeval
richard-burhans Nov 15, 2024
9b35d02
patches
richard-burhans Nov 15, 2024
9cab966
Merge branch 'rdeval' of https://github.com/richard-burhans/bioconda-…
richard-burhans Nov 15, 2024
95f5fe8
requirememts
richard-burhans Nov 15, 2024
4e0433d
zlib
richard-burhans Nov 15, 2024
48e074c
zlib
richard-burhans Nov 15, 2024
5b30688
zlib
richard-burhans Nov 15, 2024
921aea7
zlib
richard-burhans Nov 15, 2024
b2ae0dd
Merge branch 'master' into rdeval
richard-burhans Nov 15, 2024
bbb7cac
Merge branch 'master' into rdeval
richard-burhans Nov 15, 2024
83bc1de
reads
richard-burhans Nov 15, 2024
c761508
Merge branch 'master' into rdeval
richard-burhans Nov 15, 2024
e3a192a
Merge branch 'master' into rdeval
richard-burhans Nov 15, 2024
6ab51c5
rename patch files
richard-burhans Nov 15, 2024
168d50a
removed patches
richard-burhans Nov 15, 2024
e8bec8a
Merge branch 'master' into rdeval
richard-burhans Nov 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions recipes/rdeval/Makefile.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,12 @@
INCLUDE = include
BINDIR := $(BUILD)/.o

-LDFLAGS := -pthread
+ifeq ($(origin LDFLAGS), undefined)
+ LDFLAGS := -pthread
+else
+ LDFLAGS := $(LDFLAGS) -pthread
+endif
+
LIBS = -lz

OBJS := main input reads
@@ -27,7 +32,7 @@
all: head validate regenerate

$(BINDIR)%: $(SOURCE)/%.cpp $(INCLUDE)/%.h | $(BINDIR)
- $(CXX) $(CXXFLAGS) $(LDFLAGS) -c $(SOURCE)/$(notdir $@).cpp -o $@
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $(SOURCE)/$(notdir $@).cpp -o $@
richard-burhans marked this conversation as resolved.
Show resolved Hide resolved

.PHONY: gfalibs
gfalibs:
16 changes: 12 additions & 4 deletions recipes/rdeval/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,21 @@

set -o errexit
set -o nounset
set -o xtrace

if [ -e "$PREFIX/include" ]; then
export CPPFLAGS="${CPPFLAGS:+$CPPFLAGS }-I$PREFIX/include"
fi

if [ -e "$PREFIX/lib" ]; then
export LDFLAGS="${LDFLAGS:+$LDFLAGS }-L$PREFIX/lib"
fi

echo "CPPFLAGS=\"$CPPFLAGS\""
echo "LDFLAGS=\"$LDFLAGS\""

cd "$SRC_DIR"

export CXXFLAGS="$CXXFLAGS -O3 -I$PREFIX/include"
export LDFLAGS="$LDFLAGS -L$PREFIX/lib"
make

make -j"${CPU_COUNT}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -Wno-unused-command-line-argument" LDFLAGS="${LDFLAGS}"
install -d "$PREFIX/bin"
install -v -m 0755 build/bin/rdeval "$PREFIX/bin/"
25 changes: 25 additions & 0 deletions recipes/rdeval/gfalibs-Makefile.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
--- a/gfalibs/Makefile
+++ b/gfalibs/Makefile
@@ -1,4 +1,4 @@
-CXX = g++
+CXX ?= g++
INCLUDE_DIR = -I./include
WARNINGS = -Wall -Wextra

@@ -8,15 +8,13 @@
BUILD = build/bin
SOURCE = src
INCLUDE = include
-LDFLAGS :=

SOURCES = $(addsuffix .o, input-filters input-gfa input-agp gfa gfa-lines log stream-obj uid-generator struct output memory)

all: $(SOURCES)
- @

%.o: $(SOURCE)/%.cpp $(INCLUDE)/%.h
- $(CXX) $(CXXFLAGS) $(LDFLAGS) -c $(SOURCE)/$(basename $@).cpp -o $@
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(SOURCE)/$(basename $@).cpp -o $@

clean:
$(RM) *.o
30 changes: 0 additions & 30 deletions recipes/rdeval/gfalibs.patch

This file was deleted.

8 changes: 3 additions & 5 deletions recipes/rdeval/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ source:
url: https://github.com/vgl-hub/{{ name }}/releases/download/v{{ version }}/{{ name }}.v{{ version }}-with_submodules.zip
sha256: 56c2f4d7d2c22b27d1b380dc41b81cc77a2d97c792a69b9360bed9e0027bac4d
patches:
- zlib.patch
- foo.patch
- gfalibs.patch
- Makefile.patch
- gfalibs-Makefile.patch

build:
number: 0
number: 1
run_exports:
- {{ pin_subpackage(name|lower, max_pin="x.x") }}

Expand All @@ -23,7 +22,6 @@ requirements:
- {{ compiler('cxx') }}
- make
host:
- pthread-stubs
- zlib

test:
Expand Down
10 changes: 10 additions & 0 deletions recipes/rdeval/reads.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- a/src/reads.cpp
+++ b/src/reads.cpp
@@ -178,7 +178,6 @@

StreamObj streamObj;
stream = streamObj.openStream(userInput, 'r', i);
- Sequences* readBatch = new Sequences;

while (getline(*stream, newLine)) {

52 changes: 0 additions & 52 deletions recipes/rdeval/zlib.patch

This file was deleted.