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 774581382AC for ; Sun, 19 Jun 2016 09:55:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA7F4E0B5C; Sun, 19 Jun 2016 09:55:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44F01E0B5C for ; Sun, 19 Jun 2016 09:55:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F0AD033E142 for ; Sun, 19 Jun 2016 09:55:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 60F542323 for ; Sun, 19 Jun 2016 09:55:44 +0000 (UTC) From: "Andrew Savchenko" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Savchenko" Message-ID: <1466330136.683a1377d8de799d4e190229c131bd95dad9f1c0.bircoph@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-physics/root/files/root-6.04.06-gsl2.patch sci-physics/root/root-6.04.06.ebuild X-VCS-Directories: sci-physics/root/ sci-physics/root/files/ X-VCS-Committer: bircoph X-VCS-Committer-Name: Andrew Savchenko X-VCS-Revision: 683a1377d8de799d4e190229c131bd95dad9f1c0 X-VCS-Branch: master Date: Sun, 19 Jun 2016 09:55:44 +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: 5f35c93f-0679-43cb-b62c-e46d69c77eeb X-Archives-Hash: 9bdb0f053c7fd5a2cea1e38bff16032d commit: 683a1377d8de799d4e190229c131bd95dad9f1c0 Author: Andrew Savchenko gentoo org> AuthorDate: Sun Jun 19 09:55:12 2016 +0000 Commit: Andrew Savchenko gentoo org> CommitDate: Sun Jun 19 09:55:36 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=683a1377 sci-physics/root: fix bug 575686 Apply upstream patch to support gsl-2. Package-Manager: portage-2.3.0_rc1 Signed-off-by: Andrew Savchenko gentoo.org> sci-physics/root/files/root-6.04.06-gsl2.patch | 58 ++++++++++++++++++++++++++ sci-physics/root/root-6.04.06.ebuild | 3 +- 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/sci-physics/root/files/root-6.04.06-gsl2.patch b/sci-physics/root/files/root-6.04.06-gsl2.patch new file mode 100644 index 0000000..5d9fb10 --- /dev/null +++ b/sci-physics/root/files/root-6.04.06-gsl2.patch @@ -0,0 +1,58 @@ +commit ee9964210c56e7c1868618a4434c5340fef38fe4 +Author: Pere Mato +Date: Tue Dec 15 11:58:24 2015 +0100 + + Fix for ROOT-7776 - Integrate GSL 2.0 in ROOT. Changed the version used when option builtin_gsl=ON to 2.1 (latest production). + +diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake +index 6f04dad..309a8de 100644 +--- a/cmake/modules/SearchInstalledSoftware.cmake ++++ b/cmake/modules/SearchInstalledSoftware.cmake +@@ -332,7 +332,7 @@ if(mathmore OR builtin_gsl) + endif() + endif() + else() +- set(gsl_version 1.15) ++ set(gsl_version 2.1) + message(STATUS "Downloading and building GSL version ${gsl_version}") + ExternalProject_Add( + GSL +diff --git a/math/mathmore/src/GSLMultiFit.h b/math/mathmore/src/GSLMultiFit.h +index 1d86da5..5b5a887 100644 +--- a/math/mathmore/src/GSLMultiFit.h ++++ b/math/mathmore/src/GSLMultiFit.h +@@ -31,6 +31,7 @@ + #include "gsl/gsl_matrix.h" + #include "gsl/gsl_multifit_nlin.h" + #include "gsl/gsl_blas.h" ++#include "gsl/gsl_version.h" + #include "GSLMultiFitFunctionWrapper.h" + + #include "Math/IFunction.h" +@@ -143,7 +144,11 @@ public: + /// gradient value at the minimum + const double * Gradient() const { + if (fSolver == 0) return 0; ++#if GSL_MAJOR_VERSION > 1 ++ fType->gradient(fSolver->state, fVec); ++#else + gsl_multifit_gradient(fSolver->J, fSolver->f,fVec); ++#endif + return fVec->data; + } + +@@ -154,7 +159,14 @@ public: + unsigned int npar = fSolver->fdf->p; + fCov = gsl_matrix_alloc( npar, npar ); + static double kEpsrel = 0.0001; ++#if GSL_MAJOR_VERSION > 1 ++ gsl_matrix* J = gsl_matrix_alloc(npar,npar); ++ gsl_multifit_fdfsolver_jac (fSolver, J); ++ int ret = gsl_multifit_covar(J, kEpsrel, fCov); ++ gsl_matrix_free(J); ++#else + int ret = gsl_multifit_covar(fSolver->J, kEpsrel, fCov); ++#endif + if (ret != GSL_SUCCESS) return 0; + return fCov->data; + } diff --git a/sci-physics/root/root-6.04.06.ebuild b/sci-physics/root/root-6.04.06.ebuild index 38e6f29..9cfe322 100644 --- a/sci-physics/root/root-6.04.06.ebuild +++ b/sci-physics/root/root-6.04.06.ebuild @@ -241,7 +241,8 @@ src_prepare() { "${FILESDIR}"/${PN}-6.00.01-dotfont.patch \ "${FILESDIR}"/${PN}-6.00.01-llvm.patch \ "${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \ - "${FILESDIR}"/${P}-prop-flags.patch + "${FILESDIR}"/${P}-prop-flags.patch \ + "${FILESDIR}"/${P}-gsl2.patch # "${FILESDIR}"/${PN}-6.02.05-xrootd4.patch # "${FILESDIR}"/${PN}-6.02.05-dictpch.patch \