| 1 |
commit: 20b211f3ab9ace0a1ae4bd0a09831ad71ec691da |
| 2 |
Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz> |
| 3 |
AuthorDate: Mon Mar 27 01:08:12 2017 +0000 |
| 4 |
Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz> |
| 5 |
CommitDate: Mon Mar 27 01:08:12 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=20b211f3 |
| 7 |
|
| 8 |
sci-biology/ncbi-tools++: compiles via 'make -j1' now |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.1 |
| 11 |
|
| 12 |
...ols++-18.0.0-fix-app-blast_sample-linking.patch | 28 ++++++++++++++++++++++ |
| 13 |
.../ncbi-tools++/ncbi-tools++-18.0.0.ebuild | 1 + |
| 14 |
2 files changed, 29 insertions(+) |
| 15 |
|
| 16 |
diff --git a/sci-biology/ncbi-tools++/files/ncbi-tools++-18.0.0-fix-app-blast_sample-linking.patch b/sci-biology/ncbi-tools++/files/ncbi-tools++-18.0.0-fix-app-blast_sample-linking.patch |
| 17 |
new file mode 100644 |
| 18 |
index 000000000..cc0444d5c |
| 19 |
--- /dev/null |
| 20 |
+++ b/sci-biology/ncbi-tools++/files/ncbi-tools++-18.0.0-fix-app-blast_sample-linking.patch |
| 21 |
@@ -0,0 +1,28 @@ |
| 22 |
+--- ncbi_cxx--18_0_0/src/sample/app/blast/Makefile.blast_sample.app.ori 2017-03-27 03:01:00.032137965 +0200 |
| 23 |
++++ ncbi_cxx--18_0_0/src/sample/app/blast/Makefile.blast_sample.app 2017-03-27 03:01:29.732137720 +0200 |
| 24 |
+@@ -12,9 +12,9 @@ |
| 25 |
+ # the lines reading "### BEGIN/END COPIED SETTINGS" in any way. |
| 26 |
+ |
| 27 |
+ ### BEGIN COPIED SETTINGS |
| 28 |
+-LIB_ = xobjsimple $(BLAST_LIBS) $(OBJMGR_LIBS) |
| 29 |
++LIB_ = xobjsimple $(BLAST_LIBS) xregexp $(PCRE_LIB) $(OBJMGR_LIBS) |
| 30 |
+ LIB = $(LIB_:%=%$(STATIC)) |
| 31 |
+-LIBS = $(CMPRS_LIBS) $(NETWORK_LIBS) $(DL_LIBS) $(ORIG_LIBS) |
| 32 |
++LIBS = $(CMPRS_LIBS) $(NETWORK_LIBS) $(DL_LIBS) $(PCRE_LIBS) $(ORIG_LIBS) |
| 33 |
+ |
| 34 |
+ # These settings are necessary for optimized WorkShop builds, due to |
| 35 |
+ # BLAST's own use of them. |
| 36 |
+--- ncbi_cxx--18_0_0/src/sample/app/blast/Makefile.vsrun_sample.app.ori 2017-03-27 03:04:52.632136045 +0200 |
| 37 |
++++ ncbi_cxx--18_0_0/src/sample/app/blast/Makefile.vsrun_sample.app 2017-03-27 03:05:26.012135769 +0200 |
| 38 |
+@@ -12,9 +12,9 @@ |
| 39 |
+ # the lines reading "### BEGIN/END COPIED SETTINGS" in any way. |
| 40 |
+ |
| 41 |
+ ### BEGIN COPIED SETTINGS |
| 42 |
+-LIB_ = xobjsimple $(BLAST_INPUT_LIBS) $(BLAST_LIBS) $(OBJMGR_LIBS) |
| 43 |
++LIB_ = xobjsimple $(BLAST_INPUT_LIBS) $(BLAST_LIBS) xregexp $(PCRE_LIB) $(OBJMGR_LIBS) |
| 44 |
+ LIB = $(LIB_:%=%$(STATIC)) |
| 45 |
+-LIBS = $(CMPRS_LIBS) $(NETWORK_LIBS) $(DL_LIBS) $(ORIG_LIBS) |
| 46 |
++LIBS = $(CMPRS_LIBS) $(NETWORK_LIBS) $(DL_LIBS) $(PCRE_LIBS) $(ORIG_LIBS) |
| 47 |
+ |
| 48 |
+ # These settings are necessary for optimized WorkShop builds, due to |
| 49 |
+ # BLAST's own use of them. |
| 50 |
|
| 51 |
diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-18.0.0.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-18.0.0.ebuild |
| 52 |
index 5d0547875..10e1b7228 100644 |
| 53 |
--- a/sci-biology/ncbi-tools++/ncbi-tools++-18.0.0.ebuild |
| 54 |
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-18.0.0.ebuild |
| 55 |
@@ -132,6 +132,7 @@ src_prepare() { |
| 56 |
"${FILESDIR}"/${P}-fix-app-table2asn-linking.patch |
| 57 |
"${FILESDIR}"/${P}-fix-app-tls-linking.patch |
| 58 |
"${FILESDIR}"/${P}-fix-app-vecscreen-linking.patch |
| 59 |
+ "${FILESDIR}"/${P}-fix-app-blast_sample-linking.patch |
| 60 |
) |
| 61 |
#ncbi-tools++-18.0.0-fix-undefined-lxncbi.patch |
| 62 |
epatch ${PATCHES[@]} |
Archives