diff options
| author |   Martin Mokrejs <mmokrejs@fold.natur.cuni.cz> | 2012-02-06 19:55:58 +0100 |
|---|---|---|
| committer | Martin Mokrejs <mmokrejs@fold.natur.cuni.cz> | 2012-02-06 19:55:58 +0100 |
| commit | 644e4b2c3b32a18745448407c5c705a53ee09d9f (patch) | |
| tree | bbdbbe380a14a873057c7642b67b2ba196e17885 /sci-biology/sra_sdk | |
| parent | sci-biology/sra_sdk-2.1.6: dropping an old crap (diff) | |
| download | sci-644e4b2c3b32a18745448407c5c705a53ee09d9f.tar.gz sci-644e4b2c3b32a18745448407c5c705a53ee09d9f.tar.bz2 sci-644e4b2c3b32a18745448407c5c705a53ee09d9f.zip | |
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)
Diffstat (limited to 'sci-biology/sra_sdk')
| -rw-r--r-- | sci-biology/sra_sdk/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-biology/sra_sdk/Manifest | 1 | ||||
| -rw-r--r-- | sci-biology/sra_sdk/sra_sdk-2.1.9.ebuild | 13 |
3 files changed, 14 insertions, 5 deletions
diff --git a/sci-biology/sra_sdk/ChangeLog b/sci-biology/sra_sdk/ChangeLog index 9ac722a7b..78f9fd11b 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/Manifest b/sci-biology/sra_sdk/Manifest index ad6f74df2..53acb93cb 100644 --- a/sci-biology/sra_sdk/Manifest +++ b/sci-biology/sra_sdk/Manifest @@ -1,2 +1 @@ -DIST sra_sdk-2.1.6.tar.gz 2057465 SHA256 c0051287e9c6d00cf059b6ed9e9b922340ae9a75818bc356d47bd5bc33da8e95 SHA512 0baa5509b044a5c88313a12205c3d32c9e4036a3a7e5638c26c10d10105104774fa36b4f79907ffb255c7d1eefbd7b22b07d6ab87ab19ed3348e5f3404aff457 WHIRLPOOL 4841ed2b35cf1ddebe57f2878bd5a27e8d314251599869fb7ff159477c3dd107892b8a683e73f9f530bebe5b2a1e4ab0c01743c91813840b12a92f860b18631b DIST sra_sdk-2.1.9.tar.gz 4057520 SHA256 ecd417417b34284715a8392c0dc05cd2e3d5e2e32a0ee4ae0db830986456a38e SHA512 b63985a1ea20230b725fcc779eb646f08ec7807c652008dfaa0fd7a6dcead9cab12dd39611e9ae70b5b1dd5aeb0af561894a01e14b1ce341edec75c2915bb030 WHIRLPOOL 62d81fb1ecc68a6c5f9ff1217339461317b30b43cce60d10abc16469ba0ddbeb2e2728fd23133812e6876d37fb06fdf27b2ea0a5dd1932ecbf8c37d626236e9b 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 fcc74cbdc..ebccf807a 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/* |