diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2014-02-26 03:37:12 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2014-02-26 03:37:12 +0000 |
| commit | 9a2eeacb0ade28317f755db89475b8cdc656b693 (patch) | |
| tree | 7d9a8eb83df5aec7775312d56f59e611a4c005e7 /dev-lang/julia | |
| parent | lxml is only needed at build time. (diff) | |
| download | gentoo-2-9a2eeacb0ade28317f755db89475b8cdc656b693.tar.gz gentoo-2-9a2eeacb0ade28317f755db89475b8cdc656b693.tar.bz2 gentoo-2-9a2eeacb0ade28317f755db89475b8cdc656b693.zip | |
Revert changes that break build #501868
(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-lang/julia')
| -rw-r--r-- | dev-lang/julia/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/julia/julia-0.2.0.ebuild | 19 |
2 files changed, 9 insertions, 15 deletions
diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog index 198a3fe1506d..c8bf204783e3 100644 --- a/dev-lang/julia/ChangeLog +++ b/dev-lang/julia/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/julia # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/julia/ChangeLog,v 1.3 2014/02/25 23:17:50 calchan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/julia/ChangeLog,v 1.4 2014/02/26 03:37:12 patrick Exp $ + + 26 Feb 2014; Patrick Lauer <patrick@gentoo.org> julia-0.2.0.ebuild: + Revert changes that break build #501868 25 Feb 2014; Denis Dupeyron <calchan@gentoo.org> julia-0.2.0.ebuild: Fixed bug #501868 as well as general brokenness. diff --git a/dev-lang/julia/julia-0.2.0.ebuild b/dev-lang/julia/julia-0.2.0.ebuild index ba493a77dced..5ad41664b2d2 100644 --- a/dev-lang/julia/julia-0.2.0.ebuild +++ b/dev-lang/julia/julia-0.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/julia/julia-0.2.0.ebuild,v 1.3 2014/02/25 23:17:50 calchan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/julia/julia-0.2.0.ebuild,v 1.4 2014/02/26 03:37:12 patrick Exp $ EAPI=5 inherit eutils @@ -32,10 +32,7 @@ S="${WORKDIR}" JULIAMAKEARGS="QUIET_MAKE= USE_SYSTEM_LLVM=1 USE_SYSTEM_READLINE=1 USE_SYSTEM_PCRE=1 USE_SYSTEM_LIBM=1 \ USE_SYSTEM_GMP=1 USE_SYSTEM_LIBUNWIND=1 USE_SYSTEM_PATCHELF=1 USE_SYSTEM_FFTW=1 USE_SYSTEM_ZLIB=1 \ USE_SYSTEM_MPFR=1 USE_SYSTEM_SUITESPARSE=1 USE_SYSTEM_ARPACK=1 USE_SYSTEM_BLAS=1 USE_SYSTEM_LAPACK=1 \ - LLVM_CONFIG=/usr/bin/llvm-config USE_BLAS64=0" - -# Forcing use of 64-bit integers. If you want 64-bit integers then you need to use a BLAS implementation from the -# science overlay and julia-9999 also from the science overlay. + LLVM_CONFIG=/usr/bin/llvm-config" # scons is a dep of double-conversion DEPEND=" @@ -65,15 +62,9 @@ src_prepare() { mkdir -p deps/random cp "${DISTDIR}/dsfmt-2.2.tar.gz" deps/random/ cp "${DISTDIR}/double-conversion-1.1.1.tar.gz" deps/ - # Detect what BLAS and LAPACK implementations are being used - local BLAS_LIB="$($(tc-getPKG_CONFIG) --libs blas | sed 's/ .*$//')" - local LAPACK_LIB="$($(tc-getPKG_CONFIG) --libs lapack | sed 's/ .*$//')" - sed -e "s|-lblas|${BLAS_LIB}|" -i Make.inc || die - sed -e "s|libblas|${BLAS_LIB/-l/lib}.so|" -i Make.inc || die - sed -e "s|-llapack|${LAPACK_LIB}|" -i Make.inc || die - sed -e "s|liblapack|${LAPACK_LIB/-l/lib}.so|" -i Make.inc || die - # Set version to package version instead of git commit number - sed -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" -i Make.inc || die + # Some cleanups to avoid an OpenBlas dep, and remove some useless git errors + sed -e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" Make.inc || die + sed -e 's/$(shell git rev-parse --short=10 HEAD)/v0.2.0/' Make.inc || die } src_compile() { |