diff options
| author |   Martin Mokrejs <mmokrejs@fold.natur.cuni.cz> | 2013-01-07 23:11:42 +0100 |
|---|---|---|
| committer | Martin Mokrejs <mmokrejs@fold.natur.cuni.cz> | 2013-01-07 23:11:42 +0100 |
| commit | c98c3577380e98c53079ded665754cb13da1be43 (patch) | |
| tree | eb65af4ee8dd4ba53b9c19210dfca6fef2d0b5e6 /sci-biology | |
| parent | Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci (diff) | |
| download | sci-c98c3577380e98c53079ded665754cb13da1be43.tar.gz sci-c98c3577380e98c53079ded665754cb13da1be43.tar.bz2 sci-c98c3577380e98c53079ded665754cb13da1be43.zip | |
put back in the --as-needed LDFLAG to yield hopefully smaller executables; recreating the patch so that it applies automatically
Diffstat (limited to 'sci-biology')
| -rw-r--r-- | sci-biology/ncbi-tools++/files/make_install.patch | 34 | ||||
| -rw-r--r-- | sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild | 5 |
2 files changed, 17 insertions, 22 deletions
diff --git a/sci-biology/ncbi-tools++/files/make_install.patch b/sci-biology/ncbi-tools++/files/make_install.patch index 081d99bea..e98f1110d 100644 --- a/sci-biology/ncbi-tools++/files/make_install.patch +++ b/sci-biology/ncbi-tools++/files/make_install.patch @@ -1,22 +1,14 @@ -The C++ Toolkit now includes a copy of the SRA Toolkit, which -establishes an ncbi/ hierarchy under lib, which previously had no -subdirectories. Please try the following patch to the top Makefile (and -its progenitor, src/build-system/Makefile.in.top): - -Index: Makefile.in.top -=================================================================== ---- Makefile.in.top (revision 358093) -+++ Makefile.in.top (working copy) +--- src/build-system/Makefile.in.top.old 2013-01-07 23:07:29.970141951 +0100 ++++ src/build-system/Makefile.in.top 2013-01-07 23:08:37.940990190 +0100 @@ -39,7 +39,10 @@ - -$(RMDIR) $(pincludedir) - $(INSTALL) -d $(bindir) $(libdir) $(pincludedir) - $(INSTALL) $(lbindir)/* $(bindir) -- $(INSTALL) -m 644 $(llibdir)/* $(libdir) -+ $(INSTALL) -m 644 $(llibdir)/*.* $(libdir) -+ if test -d $(llibdir)/ncbi; then \ -+ cp -pPR $(llibdir)/ncbi $(libdir)/; \ -+ fi - -rm -f $(libdir)/lib*-static.a - cd $(libdir) && \ - for x in *.a; do ln -s "$$x" "`basename \"$$x\" .a`-static.a"; done - + -$(RMDIR) $(pincludedir) + $(INSTALL) -d $(bindir) $(libdir) $(pincludedir) + $(INSTALL) $(lbindir)/* $(bindir) +- $(INSTALL) -m 644 $(llibdir)/* $(libdir) ++ $(INSTALL) -m 644 $(llibdir)/*.* $(libdir) ++ if test -d $(llibdir)/ncbi; then \ ++ cp -pPR $(llibdir)/ncbi $(libdir)/; \ ++ fi + -rm -f $(libdir)/lib*-static.a + cd $(libdir) && \ + for x in *.a; do ln -s "$$x" "`basename \"$$x\" .a`-static.a"; done diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild index 376e6d9be..fa05240f3 100644 --- a/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild +++ b/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0.ebuild @@ -283,8 +283,10 @@ src_configure() { --with-lfs \ --prefix="${ED}"/usr \ --libdir="${ED}"/usr/$(get_libdir)/"${PN}" \ - ${myconf} LDFLAGS="-Wl,--no-as-needed" \ + ${myconf} LDFLAGS="-Wl,--as-needed" \ || die + + # ${myconf} LDFLAGS="-Wl,--no-as-needed" } src_compile() { @@ -298,6 +300,7 @@ src_install() { emake install || die # File collisions with sci-biology/ncbi-tools rm -f "${ED}"/usr/bin/{asn2asn,rpsblast,test_regexp} + mv "${ED}"/usr/bin/seedtop "${ED}"/usr/bin/seedtop2 echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}" > ${S}/99${PN} doenvd "${S}/99${PN}" |