summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Dupeyron <calchan@gentoo.org>2014-02-25 23:17:52 +0000
committerDenis Dupeyron <calchan@gentoo.org>2014-02-25 23:17:52 +0000
commit99ec4934757cc4599312cefc787154f6f9f25510 (patch)
treeb12ca84afc79d98abb9ddd65b0236394cd0a4dd8 /dev-lang/julia
parentActually remove old ebuilds. (diff)
downloadhistorical-99ec4934757cc4599312cefc787154f6f9f25510.tar.gz
historical-99ec4934757cc4599312cefc787154f6f9f25510.tar.bz2
historical-99ec4934757cc4599312cefc787154f6f9f25510.zip
Fixed bug #501868 as well as general brokenness.
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Diffstat (limited to 'dev-lang/julia')
-rw-r--r--dev-lang/julia/ChangeLog5
-rw-r--r--dev-lang/julia/Manifest4
-rw-r--r--dev-lang/julia/julia-0.2.0.ebuild19
3 files changed, 20 insertions, 8 deletions
diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog
index 4476e58d9cdb..198a3fe1506d 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.2 2014/01/09 08:02:20 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/julia/ChangeLog,v 1.3 2014/02/25 23:17:50 calchan Exp $
+
+ 25 Feb 2014; Denis Dupeyron <calchan@gentoo.org> julia-0.2.0.ebuild:
+ Fixed bug #501868 as well as general brokenness.
09 Jan 2014; Patrick Lauer <patrick@gentoo.org> julia-0.2.0.ebuild:
Fix homepage
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index c16f634182cd..4c74f6076bf5 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,6 +1,6 @@
DIST double-conversion-1.1.1.tar.gz 7012946 SHA256 e1cabb73fd69e74f145aea91100cde483aef8b79dc730fcda0a34466730d4d1d SHA512 e116196eb60077565050995b060049747a3c72e743eea21c6c9fb68414adc533d456d19e1ca241f08895cca97a38511477bdc7d2e0cae38d149c83cb9d6896ad WHIRLPOOL d69604fbb6e1b5cac8d4dd0f8cf0af4621e32548e9e5061dcb843067a3f821c6f52e918e3e367988076b9ccf0be0ab68107cc6a21b02f4de424a1d98b399fc33
DIST dsfmt-2.2.tar.gz 291253 SHA256 bc3947a9b2253a869fcbab8ff395416cb12958be9dba10793db2cd7e37b26899 SHA512 e59d54166dc2df9f6e6abd68658c3624082feabe445215256fead47a8944c41578d11c2b4ba57eac174587a45e445b2aabd867db24fd9e951842513cf914f60b WHIRLPOOL 986b24d8c302f21e305a6bbc6b33e42678c27018c71c566d3f052ce7600fd06c81d77375d08b2b40c0c4aa93ca74cad819a34d0350e33a61f5837f27de7cf193
DIST julia-0.2.0.tar.bz2 4393404 SHA256 fecde7b4fbd26093dedd04564ce12b47a232525bf036c7b5f392f369ddc9a514 SHA512 3e0718c69936959dc717cf511f8fd7086eedb2fd4996519fcdb54a0b0c38d09b5b1c7d239e9e42234aab869446feec88bfd40b5419ae74c9f15bf523a757e898 WHIRLPOOL 265650e99028260d1dfe76c504468eca23bad0881790893d8b4b6cd98b0b5a936dc064ee1b661a04c762e2d78d4d23243158f594afef27001c8b4a0de259afff
-EBUILD julia-0.2.0.ebuild 2619 SHA256 b58f8b36625372006da12fef757a6578432b80e891fdfd4b53dba1b9517dc2ce SHA512 00aa1529ac1e77dd4b335f902d2529b67b508613d032295f01a9076a898473f2fc788fd50fe4423b63d9fb31212ab805321e7f92a701ed57e8fc8ba2d7914c74 WHIRLPOOL c95aacb639ca50faaca9f983a9fa969766fe87f07d09391d4d600206eb8fff98fe9f97c76888d50a5ea3d54c44e750babc6bab9111c814a4f994fc8b25e4d472
-MISC ChangeLog 492 SHA256 b1348b64e6b3ac02f26d74d142fdb27245da46e943d26127b89a7f3c32d412d1 SHA512 67b01d6fcb96a8ce5e7b0ce9bfd7b7b81e513cdfdf03faf76d60171681193e3732a9d958056eb616b93413d8c0d06a7b538fba12d6640f419dea401bb9add37e WHIRLPOOL faa626deed21c5a75e09f6b50b53fe31c7ed3e8023b0e8d3759a5a460e57b5ffab182cdbca44f2cb34de08db3e13d76e7b3ee7098040f5279aadcb985b90ed24
+EBUILD julia-0.2.0.ebuild 3163 SHA256 5b4badf8d8cdedf3f90a92d69ee18be856b21440923c0ab43a22c02bad7fb978 SHA512 43119b0dba8197033748ea38c10c70e7894ca588fd6f633f17b35d38ab3b53c81a4c0ce7de26e010bd785ee373e922427098aae1c48491a4bed894fcd78b9bb5 WHIRLPOOL 67d2eef04eee42d3207156d2fccf11d7625d7416387be4934d65e7445c8d55e2abd3a567a359c350120f0d32fc32408a31d15c200017f1ef9e38d92c05cccc60
+MISC ChangeLog 615 SHA256 1a3698a753663f6bfc238cf1922a9dcb70bb36ec3c5e557a81104cf3cae09e4b SHA512 e335d698283b778c15e20d13f84265ece89b60b2eec092888983d605566cee93f192884bff2fc560fcdef40028cc1347a58e94c84090b2dc55db5ec7000b7120 WHIRLPOOL e943731851a4ae8cd40c54112c49da6af02faeddbed98e511dcc2bd398be2a4f4f486957e914bdb770d9d7eac3c6cb2c6203efe8e6cdbeac95e26a7dd252cff4
MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
diff --git a/dev-lang/julia/julia-0.2.0.ebuild b/dev-lang/julia/julia-0.2.0.ebuild
index 50e964bd69a9..ba493a77dced 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.2 2014/01/09 08:02:20 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/julia/julia-0.2.0.ebuild,v 1.3 2014/02/25 23:17:50 calchan Exp $
EAPI=5
inherit eutils
@@ -32,7 +32,10 @@ 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"
+ 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.
# scons is a dep of double-conversion
DEPEND="
@@ -62,9 +65,15 @@ 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/
- # 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
+ # 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
}
src_compile() {