From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 732231382C5 for ; Mon, 12 Mar 2018 15:32:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84C84E089A; Mon, 12 Mar 2018 15:32:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6322DE089A for ; Mon, 12 Mar 2018 15:32:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C2C0335C0A for ; Mon, 12 Mar 2018 15:32:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 92BD5230 for ; Mon, 12 Mar 2018 15:32:31 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1520868747.e92084cc3d3ce917eee875e3e16da54cc6f329a5.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/files/, dev-util/cmake/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/cmake/cmake-3.11.0_rc3.ebuild dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch X-VCS-Directories: dev-util/cmake/ dev-util/cmake/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: e92084cc3d3ce917eee875e3e16da54cc6f329a5 X-VCS-Branch: master Date: Mon, 12 Mar 2018 15:32:31 +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: 5cfef19c-a9ee-4b02-af18-ab58b685a4c0 X-Archives-Hash: f50c39c840c4f1a16a4847655bfb0fc1 commit: e92084cc3d3ce917eee875e3e16da54cc6f329a5 Author: Rolf Eike Beer sf-mail de> AuthorDate: Fri Mar 9 20:05:35 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Mar 12 15:32:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e92084cc dev-util/cmake: simplify FindBLAS patch Most of the previous Gentoo patch has been upstreamed. Closes: https://github.com/gentoo/gentoo/pull/7409 dev-util/cmake/cmake-3.11.0_rc3.ebuild | 2 +- .../cmake/files/cmake-3.11.0_rc2-FindBLAS.patch | 23 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dev-util/cmake/cmake-3.11.0_rc3.ebuild b/dev-util/cmake/cmake-3.11.0_rc3.ebuild index ebda7cc29dd..61e5d006511 100644 --- a/dev-util/cmake/cmake-3.11.0_rc3.ebuild +++ b/dev-util/cmake/cmake-3.11.0_rc3.ebuild @@ -51,7 +51,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch # handle gentoo packaging in find modules - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch + "${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch "${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch diff --git a/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch b/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch new file mode 100644 index 00000000000..6bad45b2087 --- /dev/null +++ b/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch @@ -0,0 +1,23 @@ +--- a/Modules/FindBLAS.cmake ++++ b/Modules/FindBLAS.cmake +@@ -4,6 +4,10 @@ + # + # Find BLAS library + # ++# Version modified for Gentoo Linux. ++# If a valid PkgConfig configuration is found, this overrides and cancels ++# all further checks. ++# + # This module finds an installed fortran library that implements the + # BLAS linear-algebra interface (see http://www.netlib.org/blas/). The + # list of libraries searched for is taken from the autoconf macro file, +@@ -50,6 +54,9 @@ + # (To distribute this file outside of CMake, substitute the full + # License text for the above reference.) + ++# first, try PkgConfig ++set(BLA_PREFER_PKGCONFIG On) ++ + include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake) +