public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-lang/julia: julia-0.2.0.ebuild ChangeLog
@ 2014-02-26  3:37 Patrick Lauer (patrick)
  0 siblings, 0 replies; 2+ messages in thread
From: Patrick Lauer (patrick) @ 2014-02-26  3:37 UTC (permalink / raw
  To: gentoo-commits

patrick     14/02/26 03:37:12

  Modified:             julia-0.2.0.ebuild ChangeLog
  Log:
  Revert changes that break build #501868
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.4                  dev-lang/julia/julia-0.2.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/julia-0.2.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/julia-0.2.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/julia-0.2.0.ebuild?r1=1.3&r2=1.4

Index: julia-0.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/julia/julia-0.2.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- julia-0.2.0.ebuild	25 Feb 2014 23:17:50 -0000	1.3
+++ julia-0.2.0.ebuild	26 Feb 2014 03:37:12 -0000	1.4
@@ -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 @@
 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 @@
 	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() {



1.4                  dev-lang/julia/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/ChangeLog?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/ChangeLog?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/ChangeLog?r1=1.3&r2=1.4

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/julia/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog	25 Feb 2014 23:17:50 -0000	1.3
+++ ChangeLog	26 Feb 2014 03:37:12 -0000	1.4
@@ -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.





^ permalink raw reply	[flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/julia: julia-0.2.0.ebuild ChangeLog
@ 2014-01-09  8:02 Patrick Lauer (patrick)
  0 siblings, 0 replies; 2+ messages in thread
From: Patrick Lauer (patrick) @ 2014-01-09  8:02 UTC (permalink / raw
  To: gentoo-commits

patrick     14/01/09 08:02:20

  Modified:             julia-0.2.0.ebuild ChangeLog
  Log:
  Fix homepage
  
  (Portage version: 2.2.8/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.2                  dev-lang/julia/julia-0.2.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/julia-0.2.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/julia-0.2.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/julia-0.2.0.ebuild?r1=1.1&r2=1.2

Index: julia-0.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/julia/julia-0.2.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- julia-0.2.0.ebuild	25 Nov 2013 23:40:37 -0000	1.1
+++ julia-0.2.0.ebuild	9 Jan 2014 08:02:20 -0000	1.2
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.1 2013/11/25 23:40:37 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/julia/julia-0.2.0.ebuild,v 1.2 2014/01/09 08:02:20 patrick Exp $
 EAPI=5
 
 inherit eutils
 
 DESCRIPTION="High-level, high-performance dynamic programming language for technical computing"
 
-HOMEPAGE="http://http://julialang.org/"
+HOMEPAGE="http://julialang.org/"
 
 # uses gfortran in some places, dependencies don't reflect that yet
 
@@ -34,7 +34,7 @@
 		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"
 
-# scons is a dep of double-conversion                                                                                                                                                                                                                                          
+# scons is a dep of double-conversion
 DEPEND="
 	=sys-devel/llvm-3.3*
 	dev-lang/perl
@@ -55,7 +55,7 @@
 RDEPEND="sys-libs/readline"
 
 src_prepare() {
-	#uurgh, no fetching in ebuild                                                                                                                                                                                                                                          
+	#uurgh, no fetching in ebuild
 	sed -i -e 's~$(JLDOWNLOAD)~/bin/true~' deps/Makefile || die "Oopsie"
 	sed -i -e 's~git submodule~/bin/true~g' deps/Makefile || die "Ooopsie"
 	# and we need to build stuff, so ... let's just copy around and pray!



1.2                  dev-lang/julia/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/ChangeLog?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/ChangeLog?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/ChangeLog?r1=1.1&r2=1.2

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/julia/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog	25 Nov 2013 23:40:37 -0000	1.1
+++ ChangeLog	9 Jan 2014 08:02:20 -0000	1.2
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/julia
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/julia/ChangeLog,v 1.1 2013/11/25 23:40:37 patrick Exp $
+# 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 $
+
+  09 Jan 2014; Patrick Lauer <patrick@gentoo.org> julia-0.2.0.ebuild:
+  Fix homepage
 
 *julia-0.2.0 (25 Nov 2013)
 





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-02-26  3:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-26  3:37 [gentoo-commits] gentoo-x86 commit in dev-lang/julia: julia-0.2.0.ebuild ChangeLog Patrick Lauer (patrick)
  -- strict thread matches above, loose matches on Subject: below --
2014-01-09  8:02 Patrick Lauer (patrick)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox