1 |
commit: 95f436ca3a6e4e65e9db762b7d0da99172593042 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 25 12:26:00 2016 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 25 12:26:47 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95f436ca |
7 |
|
8 |
sci-biology/tophat: USE="threads" dep on dev-libs/boost |
9 |
|
10 |
Gentoo-bug: 594810 |
11 |
* Remove autoconf macros from archive, depend on |
12 |
sys-devel/autoconf instead for the latest versions. |
13 |
|
14 |
Package-Manager: portage-2.3.1 |
15 |
|
16 |
.../tophat-2.1.1-unbundle-seqan-samtools.patch | 60 +++++++++++++++++++--- |
17 |
...phat-2.1.1-r1.ebuild => tophat-2.1.1-r2.ebuild} | 9 +++- |
18 |
2 files changed, 61 insertions(+), 8 deletions(-) |
19 |
|
20 |
diff --git a/sci-biology/tophat/files/tophat-2.1.1-unbundle-seqan-samtools.patch b/sci-biology/tophat/files/tophat-2.1.1-unbundle-seqan-samtools.patch |
21 |
index c1e8bfd..9d0a269 100644 |
22 |
--- a/sci-biology/tophat/files/tophat-2.1.1-unbundle-seqan-samtools.patch |
23 |
+++ b/sci-biology/tophat/files/tophat-2.1.1-unbundle-seqan-samtools.patch |
24 |
@@ -1,9 +1,25 @@ |
25 |
Unbundle the included samtools and SeqAn, and use system libraries. |
26 |
See also: https://bugs.gentoo.org/show_bug.cgi?id=566494 |
27 |
|
28 |
---- tophat-2.1.1/configure.ac |
29 |
-+++ tophat-2.1.1/configure.ac |
30 |
-@@ -38,16 +38,6 @@ |
31 |
+Remove ancient ax_boost_base.m4 and ax_boost_thread.m4, and depend |
32 |
+on >=sys-devel/autoconf-archive-2016.09.16 in the ebuild instead. |
33 |
+See also: https://bugs.gentoo.org/show_bug.cgi?id=594810 |
34 |
+ |
35 |
+--- a/configure.ac |
36 |
++++ b/configure.ac |
37 |
+@@ -28,26 +28,15 @@ |
38 |
+ AC_PROG_INSTALL |
39 |
+ AM_PATH_PYTHON([2.4]) |
40 |
+ |
41 |
+-m4_include([ax_boost_base.m4]) |
42 |
+-m4_include([ax_boost_thread.m4]) |
43 |
+ # CXXFLAGS="$CXXFLAGS $threadLib" |
44 |
+ AX_BOOST_BASE([1.38.0]) |
45 |
++AX_BOOST_SYSTEM |
46 |
+ AX_BOOST_THREAD |
47 |
+-if test -z "$BOOST_THREAD_LIBS"; then |
48 |
++if test -z "$BOOST_THREAD_LIB"; then |
49 |
+ AC_MSG_ERROR([boost.thread not found. Aborting.]) |
50 |
fi |
51 |
|
52 |
|
53 |
@@ -20,7 +36,7 @@ See also: https://bugs.gentoo.org/show_bug.cgi?id=566494 |
54 |
# Checks for header files. |
55 |
AC_CHECK_HEADERS([stdlib.h string.h unistd.h]) |
56 |
|
57 |
-@@ -80,32 +70,23 @@ |
58 |
+@@ -80,32 +69,23 @@ |
59 |
# set CFLAGS and CXXFLAGS |
60 |
#user_CFLAGS="${CXXFLAGS}" |
61 |
user_CFLAGS=${CFLAGS} |
62 |
@@ -55,8 +71,17 @@ See also: https://bugs.gentoo.org/show_bug.cgi?id=566494 |
63 |
LDFLAGS="$BAM_LDFLAGS $BOOST_LDFLAGS $user_LDFLAGS" |
64 |
|
65 |
AM_INIT_AUTOMAKE([-Wall foreign tar-pax foreign]) |
66 |
---- tophat-2.1.1/src/Makefile.am |
67 |
-+++ tophat-2.1.1/src/Makefile.am |
68 |
+@@ -122,7 +102,7 @@ |
69 |
+ -- ${PACKAGE_STRING} Configuration Results -- |
70 |
+ C++ compiler: ${CXX} ${CXXFLAGS} |
71 |
+ Linker flags: ${LDFLAGS} |
72 |
+- BOOST libraries: ${BOOST_THREAD_LIBS}" |
73 |
++ BOOST libraries: ${BOOST_THREAD_LIB}" |
74 |
+ |
75 |
+ if test x"${GCC}" = x"yes" ; then |
76 |
+ gcc_version=`${CC} --version | head -n 1` |
77 |
+--- a/src/Makefile.am |
78 |
++++ b/src/Makefile.am |
79 |
@@ -683,17 +683,12 @@ |
80 |
SeqAn-1.4.2/seqan/system/system_thread.h \ |
81 |
SeqAn-1.4.2/seqan/version.h |
82 |
@@ -96,6 +121,29 @@ See also: https://bugs.gentoo.org/show_bug.cgi?id=566494 |
83 |
|
84 |
noinst_HEADERS = \ |
85 |
reads.h \ |
86 |
+@@ -801,11 +793,11 @@ |
87 |
+ prep_reads_LDFLAGS = $(BAM_LDFLAGS) $(LDFLAGS) |
88 |
+ |
89 |
+ segment_juncs_SOURCES = segment_juncs.cpp |
90 |
+-segment_juncs_LDADD = $(top_builddir)/src/libtophat.a $(BOOST_THREAD_LIBS) $(BOOST_SYSTEM_LIB) $(BAM_LIB) |
91 |
++segment_juncs_LDADD = $(top_builddir)/src/libtophat.a $(BOOST_THREAD_LIB) $(BOOST_SYSTEM_LIB) $(BAM_LIB) |
92 |
+ segment_juncs_LDFLAGS = $(BAM_LDFLAGS) $(LDFLAGS) $(BOOST_LDFLAGS) |
93 |
+ |
94 |
+ long_spanning_reads_SOURCES = long_spanning_reads.cpp |
95 |
+-long_spanning_reads_LDADD = $(top_builddir)/src/libtophat.a $(BOOST_THREAD_LIBS) $(BOOST_SYSTEM_LIB) $(BAM_LIB) |
96 |
++long_spanning_reads_LDADD = $(top_builddir)/src/libtophat.a $(BOOST_THREAD_LIB) $(BOOST_SYSTEM_LIB) $(BAM_LIB) |
97 |
+ long_spanning_reads_LDFLAGS = $(BAM_LDFLAGS) $(LDFLAGS) $(BOOST_LDFLAGS) |
98 |
+ |
99 |
+ gtf_juncs_SOURCES = gtf_juncs.cpp |
100 |
+@@ -817,7 +809,7 @@ |
101 |
+ juncs_db_LDFLAGS = $(BAM_LDFLAGS) $(LDFLAGS) |
102 |
+ |
103 |
+ tophat_reports_SOURCES = tophat_reports.cpp |
104 |
+-tophat_reports_LDADD = $(top_builddir)/src/libtophat.a $(BOOST_THREAD_LIBS) $(BOOST_SYSTEM_LIB) $(BAM_LIB) |
105 |
++tophat_reports_LDADD = $(top_builddir)/src/libtophat.a $(BOOST_THREAD_LIB) $(BOOST_SYSTEM_LIB) $(BAM_LIB) |
106 |
+ tophat_reports_LDFLAGS = $(BAM_LDFLAGS) $(LDFLAGS) $(BOOST_LDFLAGS) |
107 |
+ |
108 |
+ fix_map_ordering_SOURCES = fix_map_ordering.cpp |
109 |
@@ -844,15 +836,5 @@ |
110 |
gtf_to_fasta_LDADD = $(top_builddir)/src/libtophat.a libgc.a $(BAM_LIB) |
111 |
gtf_to_fasta_LDFLAGS = $(BAM_LDFLAGS) $(LDFLAGS) |
112 |
|
113 |
diff --git a/sci-biology/tophat/tophat-2.1.1-r1.ebuild b/sci-biology/tophat/tophat-2.1.1-r2.ebuild |
114 |
similarity index 88% |
115 |
rename from sci-biology/tophat/tophat-2.1.1-r1.ebuild |
116 |
rename to sci-biology/tophat/tophat-2.1.1-r2.ebuild |
117 |
index 6c6690a..52a75a6 100644 |
118 |
--- a/sci-biology/tophat/tophat-2.1.1-r1.ebuild |
119 |
+++ b/sci-biology/tophat/tophat-2.1.1-r2.ebuild |
120 |
@@ -19,12 +19,13 @@ IUSE="debug" |
121 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
122 |
|
123 |
RDEPEND="${PYTHON_DEPS} |
124 |
- dev-libs/boost:= |
125 |
+ dev-libs/boost:=[threads] |
126 |
sci-biology/samtools:0.1-legacy |
127 |
sci-biology/bowtie:2" |
128 |
DEPEND="${RDEPEND} |
129 |
virtual/pkgconfig |
130 |
- sci-biology/seqan:1.4" |
131 |
+ sci-biology/seqan:1.4 |
132 |
+ >=sys-devel/autoconf-archive-2016.09.16" |
133 |
|
134 |
PATCHES=( |
135 |
"${FILESDIR}/${P}-unbundle-seqan-samtools.patch" |
136 |
@@ -52,6 +53,10 @@ src_prepare() { |
137 |
append-cflags -Wno-unused-but-set-variable -Wno-unused-variable |
138 |
append-cppflags "$($(tc-getPKG_CONFIG) --cflags seqan-1.4)" |
139 |
|
140 |
+ # remove ancient autoconf archive macros, wreaking havoc, |
141 |
+ # depend on sys-devel/autoconf-archive instead, bug #594810 |
142 |
+ rm {ax_boost_thread,ax_boost_base}.m4 || die |
143 |
+ |
144 |
eautoreconf |
145 |
} |