From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AD362138330 for ; Fri, 25 May 2018 07:47:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BF0AE0837; Fri, 25 May 2018 07:47:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 31D00E0837 for ; Fri, 25 May 2018 07:47:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D4651335C87 for ; Fri, 25 May 2018 07:47:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E7042A3 for ; Fri, 25 May 2018 07:47:21 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1527234424.58113ca5100fe4f6c39d31c9a2c99bacc9a195b6.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/julia/julia-0.6.2.ebuild dev-lang/julia/julia-9999.ebuild X-VCS-Directories: dev-lang/julia/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 58113ca5100fe4f6c39d31c9a2c99bacc9a195b6 X-VCS-Branch: master Date: Fri, 25 May 2018 07:47:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 781ac892-e646-440f-a67c-532809eecd40 X-Archives-Hash: 32eb1831f355931b498915eddf4c988c commit: 58113ca5100fe4f6c39d31c9a2c99bacc9a195b6 Author: Fabian Groffen gentoo org> AuthorDate: Fri May 25 07:47:04 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri May 25 07:47:04 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58113ca5 dev-lang/julia: fix Prefix installation, thanks Chris Rorvick, bug #651954 Closes: https://bugs.gentoo.org/651954 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-lang/julia/julia-0.6.2.ebuild | 6 ++++-- dev-lang/julia/julia-9999.ebuild | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dev-lang/julia/julia-0.6.2.ebuild b/dev-lang/julia/julia-0.6.2.ebuild index 397cd144fe2..d1600435e50 100644 --- a/dev-lang/julia/julia-0.6.2.ebuild +++ b/dev-lang/julia/julia-0.6.2.ebuild @@ -153,7 +153,8 @@ src_compile() { emake cleanall emake VERBOSE=1 julia-release \ - prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" + prefix="${EPREFIX}/usr" DESTDIR="${D}" \ + CC="$(tc-getCC)" CXX="$(tc-getCXX)" pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}') emake } @@ -172,7 +173,8 @@ src_install() { git commit -a --allow-empty -m "initial" || die "git failed" emake install \ - prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" + prefix="${EPREFIX}/usr" DESTDIR="${D}" \ + CC="$(tc-getCC)" CXX="$(tc-getCXX)" cat > 99julia <<-EOF LDPATH=${EROOT%/}/usr/$(get_libdir)/julia EOF diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild index 86d5657b25d..8e0c10fd426 100644 --- a/dev-lang/julia/julia-9999.ebuild +++ b/dev-lang/julia/julia-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -138,7 +138,8 @@ src_compile() { emake cleanall emake VERBOSE=1 julia-release \ - prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" + prefix="${EPREFIX}/usr" DESTDIR="${D}" \ + CC="$(tc-getCC)" CXX="$(tc-getCXX)" pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}') emake } @@ -149,7 +150,8 @@ src_test() { src_install() { emake install \ - prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" + prefix="${EPREFIX}/usr" DESTDIR="${D}" \ + CC="$(tc-getCC)" CXX="$(tc-getCXX)" cat > 99julia <<-EOF LDPATH=${EROOT%/}/usr/$(get_libdir)/julia EOF