aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Mokrejs <mmokrejs@fold.natur.cuni.cz>2018-05-08 00:33:06 +0200
committerMartin Mokrejs <mmokrejs@fold.natur.cuni.cz>2018-05-08 00:33:06 +0200
commit2ae549fb69309b8ab8537b3e9a8ea158d375cf1d (patch)
tree5a63e549a08a256a58d30f8d0e61aa7284594ae8
parentsci-biology/kat: various fixes for issue #867 (diff)
downloadsci-2ae549fb69309b8ab8537b3e9a8ea158d375cf1d.zip
sci-2ae549fb69309b8ab8537b3e9a8ea158d375cf1d.tar.gz
sci-2ae549fb69309b8ab8537b3e9a8ea158d375cf1d.tar.bz2
sci-biology/kat: removing patches for 2.4.1 version
Package-Manager: Portage-2.3.31, Repoman-2.3.9
-rw-r--r--sci-biology/kat/files/kat-2.4.1-make_no_pykat.patch15
-rw-r--r--sci-biology/kat/files/kat-2.4.1-no_static_build.patch43
2 files changed, 0 insertions, 58 deletions
diff --git a/sci-biology/kat/files/kat-2.4.1-make_no_pykat.patch b/sci-biology/kat/files/kat-2.4.1-make_no_pykat.patch
deleted file mode 100644
index 7ba0801..0000000
--- a/sci-biology/kat/files/kat-2.4.1-make_no_pykat.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 5f0f42e..4da6c05 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -21,10 +21,6 @@ dist_noinst_SCRIPTS = autogen.sh antigen.sh build_boost.sh
- # SRC DIRS
- make_dirs=deps/jellyfish-2.2.0 deps/seqan-library-2.0.0 lib src tests
-
--if MAKE_PYKAT
-- make_dirs += scripts
--endif
--
- if MAKE_DOCS
- make_dirs += doc
- endif
diff --git a/sci-biology/kat/files/kat-2.4.1-no_static_build.patch b/sci-biology/kat/files/kat-2.4.1-no_static_build.patch
deleted file mode 100644
index c8ac6c9..0000000
--- a/sci-biology/kat/files/kat-2.4.1-no_static_build.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index b68c514..00c8a2e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -159,11 +159,11 @@ if [[ "${make_pykat}" == "yes" ]]; then
- AM_CPPFLAGS="${ZLIB_CPPFLAGS} ${PYTHON_CPPFLAGS}"
- AM_LIBS="${PTHREAD_CFLAGS} ${ZLIB_LIB} ${RT_LIB} ${PYTHON_EXTRA_LIBS} ${PYTHON_LIBS}"
- #AM_LDFLAGS="${ZLIB_LDFLAGS} ${PYTHON_EXTRA_LDFLAGS} ${PYTHON_RPATH} -static-libstdc++"
-- AM_LDFLAGS="${ZLIB_LDFLAGS} -static-libstdc++ ${PYTHON_RPATH}"
-+ AM_LDFLAGS="${ZLIB_LDFLAGS} ${PYTHON_RPATH}"
- else
- AM_CPPFLAGS="${ZLIB_CPPFLAGS}"
- AM_LIBS="${PTHREAD_CFLAGS} ${ZLIB_LIB} ${RT_LIB}"
-- AM_LDFLAGS="${ZLIB_LDFLAGS} -static-libstdc++"
-+ AM_LDFLAGS="${ZLIB_LDFLAGS}"
- fi
-
- AC_SUBST([AM_CPPFLAGS])
-diff --git a/deps/jellyfish-2.2.0/Makefile.am b/deps/jellyfish-2.2.0/Makefile.am
-index 8f6fffd..d6e0a3d 100644
---- a/deps/jellyfish-2.2.0/Makefile.am
-+++ b/deps/jellyfish-2.2.0/Makefile.am
-@@ -7,7 +7,7 @@ man1_MANS = doc/kat_jellyfish.man
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = kat_jellyfish.pc
-
--AM_LDFLAGS = $(ZLIB_LDFLAGS) $(ZLIB_LIB) -lpthread -static-libstdc++ # $(VALGRIND_LIBS)
-+AM_LDFLAGS = $(ZLIB_LDFLAGS) $(ZLIB_LIB) -lpthread # $(VALGRIND_LIBS)
- AM_CPPFLAGS = $(ZLIB_CPPFLAGS) -I$(top_srcdir) -I$(top_srcdir)/include # $(VALGRIND_CFLAGS)
- AM_CXXFLAGS = $(ALL_CXXFLAGS) -Wall -Wnon-virtual-dtor -Wno-deprecated-declarations
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index a2ae071..71def5c 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -19,7 +19,6 @@ kat_CPPFLAGS = \
- @AM_CPPFLAGS@
-
- kat_LDFLAGS = \
-- -static \
- @AM_LDFLAGS@
-
- kat_LDADD = \