diff options
author | Ricardo Wurmus <rekado@elephly.net> | 2018-10-21 14:00:07 +0200 |
---|---|---|
committer | Ricardo Wurmus <rekado@elephly.net> | 2018-10-21 23:06:46 +0200 |
commit | 7a1e62ca67849f9ca19ded4d26c542021db71e38 (patch) | |
tree | 0b2d20288c9988592bb6fa9a6e1e027a048bc80c /gnu/packages/patches | |
parent | 4d494a4fa3ebb2d1deacede405d0b0d8e5dbc32b (diff) | |
download | guix-patches-7a1e62ca67849f9ca19ded4d26c542021db71e38.tar guix-patches-7a1e62ca67849f9ca19ded4d26c542021db71e38.tar.gz |
gnu: delly: Update to 0.7.9.
* gnu/packages/bioinformatics.scm (delly): Update to 0.7.9.
[source]: Fetch from git.
[arguments]: Add phase install-templates; use default install phase.
[native-inputs]: Remove python-2.
[home-page]: Use new home page.
* gnu/packages/patches/delly-use-system-libraries.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove patch.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/delly-use-system-libraries.patch | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/gnu/packages/patches/delly-use-system-libraries.patch b/gnu/packages/patches/delly-use-system-libraries.patch deleted file mode 100644 index 3315c2a176..0000000000 --- a/gnu/packages/patches/delly-use-system-libraries.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/Makefile 2017-04-09 12:48:15.000000000 +0200 -+++ b/Makefile 2017-06-21 14:26:02.749282787 +0200 -@@ -9,8 +9,8 @@ - - # Flags - CXX=g++ --CXXFLAGS += -isystem ${SEQTK_ROOT} -isystem ${BOOST_ROOT} -pedantic -W -Wall -Wno-unknown-pragmas -D__STDC_LIMIT_MACROS -fno-strict-aliasing --LDFLAGS += -L${SEQTK_ROOT} -L${BOOST_ROOT}/stage/lib -lboost_iostreams -lboost_filesystem -lboost_system -lboost_program_options -lboost_date_time -+CXXFLAGS += -pedantic -W -Wall -Wno-unknown-pragmas -D__STDC_LIMIT_MACROS -fno-strict-aliasing -+LDFLAGS += -lboost_iostreams -lboost_filesystem -lboost_system -lboost_program_options -lboost_date_time - - # Additional flags for release/debug - ifeq (${PARALLEL}, 1) -@@ -23,7 +23,7 @@ - ifeq (${STATIC}, 1) - LDFLAGS += -static -static-libgcc -pthread -lhts -lz - else -- LDFLAGS += -lhts -lz -Wl,-rpath,${SEQTK_ROOT},-rpath,${BOOST_ROOT}/stage/lib -+ LDFLAGS += -lhts -lz - endif - ifeq (${DEBUG}, 1) - CXXFLAGS += -g -O0 -fno-inline -DDEBUG -@@ -41,29 +41,17 @@ - DELLYSOURCES = $(wildcard src/*.h) $(wildcard src/*.cpp) - - # Targets --TARGETS = .htslib .bcftools .boost src/delly src/cov src/dpe -+TARGETS = src/delly src/cov src/dpe - - all: $(TARGETS) - --.htslib: $(HTSLIBSOURCES) -- cd src/htslib && make && make lib-static && cd ../../ && touch .htslib -- --.bcftools: $(HTSLIBSOURCES) -- cd src/bcftools && make && cd ../../ && touch .bcftools -- --.boost: $(BOOSTSOURCES) -- cd src/modular-boost && ./bootstrap.sh --prefix=${PWD}/src/modular-boost --without-icu --with-libraries=iostreams,filesystem,system,program_options,date_time && ./b2 && ./b2 headers && cd ../../ && touch .boost -- --src/delly: .htslib .bcftools .boost $(DELLYSOURCES) -- $(CXX) $(CXXFLAGS) $@.cpp -o $@ $(LDFLAGS) -- --src/cov: .htslib .bcftools .boost $(DELLYSOURCES) -+src/cov: $(DELLYSOURCES) - $(CXX) $(CXXFLAGS) $@.cpp -o $@ $(LDFLAGS) - --src/dpe: .htslib .bcftools .boost $(DELLYSOURCES) -+src/dpe: $(DELLYSOURCES) - $(CXX) $(CXXFLAGS) $@.cpp -o $@ $(LDFLAGS) - - clean: - cd src/htslib && make clean - cd src/modular-boost && ./b2 --clean-all -- rm -f $(TARGETS) $(TARGETS:=.o) .htslib .boost .bcftools -+ rm -f $(TARGETS) $(TARGETS:=.o) |