From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A4F62138F8D for ; Wed, 26 Feb 2014 03:37:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24E4EE0A8A; Wed, 26 Feb 2014 03:37:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9852EE0A8A for ; Wed, 26 Feb 2014 03:37:14 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8E0ED33F84C for ; Wed, 26 Feb 2014 03:37:13 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 807) id 5F9DB2004B; Wed, 26 Feb 2014 03:37:12 +0000 (UTC) From: "Patrick Lauer (patrick)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, patrick@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/julia: julia-0.2.0.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: julia-0.2.0.ebuild ChangeLog X-VCS-Directories: dev-lang/julia X-VCS-Committer: patrick X-VCS-Committer-Name: Patrick Lauer Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20140226033712.5F9DB2004B@flycatcher.gentoo.org> Date: Wed, 26 Feb 2014 03:37:12 +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: 90417b12-1077-49fb-b2ce-0a5a25d12952 X-Archives-Hash: 7ea101896d07e46d635f8c4334b08486 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 julia-0.2.0.ebuild: + Revert changes that break build #501868 25 Feb 2014; Denis Dupeyron julia-0.2.0.ebuild: Fixed bug #501868 as well as general brokenness.