public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Martin Mokrejs" <mmokrejs@fold.natur.cuni.cz>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/Atlas/
Date: Thu, 30 Jun 2016 18:06:16 +0000 (UTC)	[thread overview]
Message-ID: <1467309963.50c01592d588fb2dadc5e4ca17aefc2943cb9f96.mmokrejs@gentoo> (raw)

commit:     50c01592d588fb2dadc5e4ca17aefc2943cb9f96
Author:     Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Thu Jun 30 18:06:03 2016 +0000
Commit:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Thu Jun 30 18:06:03 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=50c01592

sci-biology/Atlas: fix Makefiles at least, will need to unbundle some gzstream library too

Package-Manager: portage-2.2.28

 sci-biology/Atlas/Atlas-2005.ebuild | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/sci-biology/Atlas/Atlas-2005.ebuild b/sci-biology/Atlas/Atlas-2005.ebuild
index c95df06..4806d1c 100644
--- a/sci-biology/Atlas/Atlas-2005.ebuild
+++ b/sci-biology/Atlas/Atlas-2005.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=5
 
+inherit toolchain-funcs
+
 DESCRIPTION="Atlas Whole Genome Assembly Suite"
 HOMEPAGE="https://www.hgsc.bcm.edu/software/atlas-whole-genome-assembly-suite"
 SRC_URI="https://www.hgsc.bcm.edu/sites/default/files/software/Atlas/atlas-src.tgz"
@@ -17,12 +19,16 @@ IUSE=""
 DEPEND="dev-libs/boost"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"/atlas-src
+S="${WORKDIR}"/atlas-src/CBT
+
+src_prepare(){
+	sed -e "s/^CC =/CC = $(tc-getCC)/" -e "s/^GCC =/GCC = $(tc-getCXX)/" -i Makefile || die
+	sed -e "s/^GCC =/GCC = $(tc-getCXX)/" -i ../CBTApps/Makefile.in || die
+}
 
 src_compile(){
 	# install headers, bins and libs into CBT_DEVEL_USER, then compile apps
-	cd src || die
-	emake CBT_DEVEL_DIR="${S}"/CBT CBT_INSTALL_DIR="${D}"
+	emake CBT_DEVEL_DIR="${S}" CBT_INSTALL_DIR="${D}"
 	cd ../CBTApps || die
-	emake CBT_DEVEL_DIR="${S}"/CBT CBT_INSTALL_DIR="${D}"
+	emake CBT_DEVEL_DIR="${S}" CBT_INSTALL_DIR="${D}"
 }


             reply	other threads:[~2016-06-30 18:06 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-30 18:06 Martin Mokrejs [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-09-27 22:43 [gentoo-commits] proj/sci:master commit in: sci-biology/Atlas/ Horea Christian
2016-09-23 17:29 Martin Mokrejs
2016-06-23 16:39 Martin Mokrejs
2015-01-10 14:07 Justin Lecher
2015-01-07 21:55 Martin Mokrejs

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1467309963.50c01592d588fb2dadc5e4ca17aefc2943cb9f96.mmokrejs@gentoo \
    --to=mmokrejs@fold.natur.cuni.cz \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox