| 1 |
patrick 14/02/26 03:37:12 |
| 2 |
|
| 3 |
Modified: julia-0.2.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Revert changes that break build #501868 |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 dev-lang/julia/julia-0.2.0.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/julia-0.2.0.ebuild?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/julia-0.2.0.ebuild?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/julia-0.2.0.ebuild?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: julia-0.2.0.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/julia/julia-0.2.0.ebuild,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- julia-0.2.0.ebuild 25 Feb 2014 23:17:50 -0000 1.3 |
| 23 |
+++ julia-0.2.0.ebuild 26 Feb 2014 03:37:12 -0000 1.4 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/julia/julia-0.2.0.ebuild,v 1.3 2014/02/25 23:17:50 calchan Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/julia/julia-0.2.0.ebuild,v 1.4 2014/02/26 03:37:12 patrick Exp $ |
| 29 |
EAPI=5 |
| 30 |
|
| 31 |
inherit eutils |
| 32 |
@@ -32,10 +32,7 @@ |
| 33 |
JULIAMAKEARGS="QUIET_MAKE= USE_SYSTEM_LLVM=1 USE_SYSTEM_READLINE=1 USE_SYSTEM_PCRE=1 USE_SYSTEM_LIBM=1 \ |
| 34 |
USE_SYSTEM_GMP=1 USE_SYSTEM_LIBUNWIND=1 USE_SYSTEM_PATCHELF=1 USE_SYSTEM_FFTW=1 USE_SYSTEM_ZLIB=1 \ |
| 35 |
USE_SYSTEM_MPFR=1 USE_SYSTEM_SUITESPARSE=1 USE_SYSTEM_ARPACK=1 USE_SYSTEM_BLAS=1 USE_SYSTEM_LAPACK=1 \ |
| 36 |
- LLVM_CONFIG=/usr/bin/llvm-config USE_BLAS64=0" |
| 37 |
- |
| 38 |
-# Forcing use of 64-bit integers. If you want 64-bit integers then you need to use a BLAS implementation from the |
| 39 |
-# science overlay and julia-9999 also from the science overlay. |
| 40 |
+ LLVM_CONFIG=/usr/bin/llvm-config" |
| 41 |
|
| 42 |
# scons is a dep of double-conversion |
| 43 |
DEPEND=" |
| 44 |
@@ -65,15 +62,9 @@ |
| 45 |
mkdir -p deps/random |
| 46 |
cp "${DISTDIR}/dsfmt-2.2.tar.gz" deps/random/ |
| 47 |
cp "${DISTDIR}/double-conversion-1.1.1.tar.gz" deps/ |
| 48 |
- # Detect what BLAS and LAPACK implementations are being used |
| 49 |
- local BLAS_LIB="$($(tc-getPKG_CONFIG) --libs blas | sed 's/ .*$//')" |
| 50 |
- local LAPACK_LIB="$($(tc-getPKG_CONFIG) --libs lapack | sed 's/ .*$//')" |
| 51 |
- sed -e "s|-lblas|${BLAS_LIB}|" -i Make.inc || die |
| 52 |
- sed -e "s|libblas|${BLAS_LIB/-l/lib}.so|" -i Make.inc || die |
| 53 |
- sed -e "s|-llapack|${LAPACK_LIB}|" -i Make.inc || die |
| 54 |
- sed -e "s|liblapack|${LAPACK_LIB/-l/lib}.so|" -i Make.inc || die |
| 55 |
- # Set version to package version instead of git commit number |
| 56 |
- sed -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" -i Make.inc || die |
| 57 |
+ # Some cleanups to avoid an OpenBlas dep, and remove some useless git errors |
| 58 |
+ sed -e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" Make.inc || die |
| 59 |
+ sed -e 's/$(shell git rev-parse --short=10 HEAD)/v0.2.0/' Make.inc || die |
| 60 |
} |
| 61 |
|
| 62 |
src_compile() { |
| 63 |
|
| 64 |
|
| 65 |
|
| 66 |
1.4 dev-lang/julia/ChangeLog |
| 67 |
|
| 68 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/ChangeLog?rev=1.4&view=markup |
| 69 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/ChangeLog?rev=1.4&content-type=text/plain |
| 70 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/ChangeLog?r1=1.3&r2=1.4 |
| 71 |
|
| 72 |
Index: ChangeLog |
| 73 |
=================================================================== |
| 74 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/julia/ChangeLog,v |
| 75 |
retrieving revision 1.3 |
| 76 |
retrieving revision 1.4 |
| 77 |
diff -u -r1.3 -r1.4 |
| 78 |
--- ChangeLog 25 Feb 2014 23:17:50 -0000 1.3 |
| 79 |
+++ ChangeLog 26 Feb 2014 03:37:12 -0000 1.4 |
| 80 |
@@ -1,6 +1,9 @@ |
| 81 |
# ChangeLog for dev-lang/julia |
| 82 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 83 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/julia/ChangeLog,v 1.3 2014/02/25 23:17:50 calchan Exp $ |
| 84 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/julia/ChangeLog,v 1.4 2014/02/26 03:37:12 patrick Exp $ |
| 85 |
+ |
| 86 |
+ 26 Feb 2014; Patrick Lauer <patrick@g.o> julia-0.2.0.ebuild: |
| 87 |
+ Revert changes that break build #501868 |
| 88 |
|
| 89 |
25 Feb 2014; Denis Dupeyron <calchan@g.o> julia-0.2.0.ebuild: |
| 90 |
Fixed bug #501868 as well as general brokenness. |
Archives