diff options
| author |   Martin Mokrejš <mmokrejs@fold.natur.cuni.cz> | 2013-09-14 00:06:41 +0200 |
|---|---|---|
| committer | Martin Mokrejš <mmokrejs@fold.natur.cuni.cz> | 2013-09-14 00:06:41 +0200 |
| commit | db3890c80a85542d3c14254c20a03bf72a2caae0 (patch) | |
| tree | 1e905ee85b5b1ccfb695a22e19004243295387ff /sci-biology/ncbi-tools++/files | |
| parent | add ncbi-tools++-9.0.0-fix-undef-reference-to-GenBankReaders_Register_Id1.pat... (diff) | |
| download | sci-db3890c80a85542d3c14254c20a03bf72a2caae0.tar.gz sci-db3890c80a85542d3c14254c20a03bf72a2caae0.tar.bz2 sci-db3890c80a85542d3c14254c20a03bf72a2caae0.zip | |
more 12.0.0 cleanup, still not working
Diffstat (limited to 'sci-biology/ncbi-tools++/files')
3 files changed, 27 insertions, 7 deletions
diff --git a/sci-biology/ncbi-tools++/files/ncbi-tools++-12.0.0-fix-FreeTDS-upstream.patch b/sci-biology/ncbi-tools++/files/ncbi-tools++-12.0.0-fix-FreeTDS-upstream.patch new file mode 100644 index 000000000..fede70e51 --- /dev/null +++ b/sci-biology/ncbi-tools++/files/ncbi-tools++-12.0.0-fix-FreeTDS-upstream.patch @@ -0,0 +1,19 @@ +--- src/app/agpconvert/Makefile.agpconvert.app.ori 2013-09-13 23:56:22.660032261 +0200 ++++ src/app/agpconvert/Makefile.agpconvert.app 2013-09-13 23:57:31.340032441 +0200 +@@ -6,13 +6,12 @@ + APP = agpconvert + SRC = agpconvert + +-LIB = xalgoseq xobjedit $(OBJREAD_LIBS) taxon1 xalnmgr xobjutil submit \ +- ncbi_xdbapi_ftds $(FTDS_LIB) tables xregexp $(PCRE_LIB) $(OBJMGR_LIBS) +-LIBS = $(FTDS_LIBS) $(CMPRS_LIBS) $(PCRE_LIBS) $(NETWORK_LIBS) $(DL_LIBS) $(ORIG_LIBS) ++LIB = $(OBJREAD_LIBS) taxon1 xregexp $(PCRE_LIB) $(OBJMGR_LIBS) ++LIBS = $(CMPRS_LIBS) $(PCRE_LIBS) $(NETWORK_LIBS) $(DL_LIBS) $(ORIG_LIBS) + + CXXFLAGS = $(FAST_CXXFLAGS) + LDFLAGS = $(FAST_LDFLAGS) + +-REQUIRES = objects algo ++REQUIRES = objects + + WATCHERS = xiangcha diff --git a/sci-biology/ncbi-tools++/files/ncbi-tools++-12.0.0-fix-creaders-linking.patch b/sci-biology/ncbi-tools++/files/ncbi-tools++-12.0.0-fix-creaders-linking.patch index 1380764f1..46c2e83fb 100644 --- a/sci-biology/ncbi-tools++/files/ncbi-tools++-12.0.0-fix-creaders-linking.patch +++ b/sci-biology/ncbi-tools++/files/ncbi-tools++-12.0.0-fix-creaders-linking.patch @@ -1,10 +1,11 @@ ---- ncbi_cxx--9_0_0/src/objtools/alnmgr/demo/Makefile.alnmrg.app (revision 413271) -+++ ncbi_cxx--9_0_0/src/objtools/alnmgr/demo/Makefile.alnmrg.app (working copy) -@@ -4,7 +4,7 @@ - APP = alnmrg +--- src/objtools/alnmgr/demo/Makefile.alnmrg.app.ori 2013-09-13 23:51:34.340031508 +0200 ++++ src/objtools/alnmgr/demo/Makefile.alnmrg.app 2013-09-13 23:51:36.660031514 +0200 +@@ -5,7 +5,7 @@ SRC = alnmrg - LIB = xalnmgr xobjread ncbi_xloader_blastdb seqdb xobjutil submit blastdb \ + + LIB = xalnmgr $(OBJREAD_LIBS) ncbi_xloader_blastdb seqdb xobjutil submit blastdb \ - tables $(OBJMGR_LIBS) + tables creaders $(OBJMGR_LIBS) LIBS = $(CMPRS_LIBS) $(DL_LIBS) $(NETWORK_LIBS) $(ORIG_LIBS) + diff --git a/sci-biology/ncbi-tools++/files/ncbi-tools++-9.0.0-fix-creaders-linking.patch b/sci-biology/ncbi-tools++/files/ncbi-tools++-9.0.0-fix-creaders-linking.patch index 1380764f1..b3b57975e 100644 --- a/sci-biology/ncbi-tools++/files/ncbi-tools++-9.0.0-fix-creaders-linking.patch +++ b/sci-biology/ncbi-tools++/files/ncbi-tools++-9.0.0-fix-creaders-linking.patch @@ -1,5 +1,5 @@ ---- ncbi_cxx--9_0_0/src/objtools/alnmgr/demo/Makefile.alnmrg.app (revision 413271) -+++ ncbi_cxx--9_0_0/src/objtools/alnmgr/demo/Makefile.alnmrg.app (working copy) +--- src/objtools/alnmgr/demo/Makefile.alnmrg.app (revision 413271) ++++ src/objtools/alnmgr/demo/Makefile.alnmrg.app (working copy) @@ -4,7 +4,7 @@ APP = alnmrg SRC = alnmrg |