[gentoo-commits] proj/sci:master commit in: sci-biology/sra_sdk/

["Martin Mokrejs" <mmokrejs@fold.natur.cuni.cz>]

commit:     644e4b2c3b32a18745448407c5c705a53ee09d9f
Author:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Mon Feb  6 18:55:58 2012 +0000
Commit:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Mon Feb  6 18:55:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=644e4b2c

sci-biology-sra_sdk-2.1.9: preserve libs written directly into  at the end of src_compile() and install them later on

(Portage version: 2.1.10.45/git/Linux x86_64, unsigned Manifest commit)

---
 sci-biology/sra_sdk/ChangeLog            |    5 +++++
 sci-biology/sra_sdk/sra_sdk-2.1.9.ebuild |   13 +++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/sci-biology/sra_sdk/ChangeLog b/sci-biology/sra_sdk/ChangeLog
index 9ac722a..78f9fd1 100644
--- a/sci-biology/sra_sdk/ChangeLog
+++ b/sci-biology/sra_sdk/ChangeLog
@@ -3,6 +3,11 @@
 # $Header: $
 
   06 Feb 2012; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
+  sra_sdk-2.1.9.ebuild:
+  preserve libs written directly into at the end of src_compile() and install
+  them later on sra_sdk-2.1.9.ebuild
+
+  06 Feb 2012; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
   sra_sdk-2.1.9.ebuild, +files/libs_sra_Makefile.patch,
   +files/tools_vdb-vcopy_Makefile.patch:
   two more Makefiles needed a DESTDIR patch, in conjunction with an ugly

diff --git a/sci-biology/sra_sdk/sra_sdk-2.1.9.ebuild b/sci-biology/sra_sdk/sra_sdk-2.1.9.ebuild
index fcc74cb..ebccf80 100644
--- a/sci-biology/sra_sdk/sra_sdk-2.1.9.ebuild
+++ b/sci-biology/sra_sdk/sra_sdk-2.1.9.ebuild
@@ -38,13 +38,17 @@ src_prepare(){
 src_compile(){
 	# COMP env variable may have 'GCC' or 'ICC' values
 	if use static; then
-		emake static LIBDIR=/lib64 DESTDIR="${D}"
+		emake static LIBDIR=/usr/lib64 DESTDIR="${D}"
 	else
-		emake dynamic LIBDIR=/lib64 DESTDIR="${D}"
+		emake dynamic LIBDIR=/usr/lib64 DESTDIR="${D}"
 	fi
 
-	LIBXML_INCLUDES="/usr/include/libxml2" make -j1 OUTDIR="${WORKDIR}"/objdir out LIBDIR=/lib64 DESTDIR="${D}" || die
-	LIBXML_INCLUDES="/usr/include/libxml2" make -j1 OUTDIR="${WORKDIR}"/objdir LIBDIR=/lib64 DESTDIR="${D}" || die
+	LIBXML_INCLUDES="/usr/include/libxml2" make -j1 OUTDIR="${WORKDIR}"/objdir out LIBDIR=/usr/lib64 DESTDIR="${D}" || die
+	LIBXML_INCLUDES="/usr/include/libxml2" make -j1 OUTDIR="${WORKDIR}"/objdir LIBDIR=/usr/lib64 DESTDIR="${D}" || die
+
+	# preserve the libs written directly into $DESTDIR by ar/ld/gcc
+	mkdir -p "${WORKDIR}"/objdir/linux/rel/gcc/x86_64/lib
+	mv "${D}"/usr/lib64/* "${WORKDIR}"/objdir/linux/rel/gcc/x86_64/lib/
 }
 
 src_install(){
@@ -59,6 +63,7 @@ src_install(){
 		dobin "${WORKDIR}"/objdir/linux/rel/gcc/x86_64/bin/*
 		# for f in ${W}/objdir/linux/rel/gcc/i386/bin/*; do if [ ! -l "$f" ]; then cp "$f" ${D}/usr/bin || die "copy failed" ; fi; done
 
+		dolib "${WORKDIR}"/objdir/linux/rel/gcc/x86_64/lib/*
 		dolib "${WORKDIR}"/objdir/linux/rel/gcc/x86_64/ilib/*
 		dolib "${WORKDIR}"/objdir/linux/rel/gcc/x86_64/mod/*
 		dolib "${WORKDIR}"/objdir/linux/rel/gcc/x86_64/wmod/*