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 9AF4A1395E2 for ; Wed, 30 Nov 2016 09:42:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E343BE0BF8; Wed, 30 Nov 2016 09:42:25 +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 5FD6CE0BF8 for ; Wed, 30 Nov 2016 09:42:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 0F40F3413AD for ; Wed, 30 Nov 2016 09:42:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D1276249C for ; Wed, 30 Nov 2016 09:42:21 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1480498927.beaae227169e69fea254a848ce1313f4491f53b1.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/cmake/cmake-3.7.0-r1.ebuild dev-util/cmake/cmake-3.7.0.ebuild dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch dev-util/cmake/files/cmake-3.5.2-FindQt4.patch X-VCS-Directories: dev-util/cmake/ dev-util/cmake/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: beaae227169e69fea254a848ce1313f4491f53b1 X-VCS-Branch: master Date: Wed, 30 Nov 2016 09:42:21 +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: f6f99e40-20c8-47e1-b41f-d9ac1b6f0e34 X-Archives-Hash: b5f0287d0b5e9752ae8f8e3811b638c9 commit: beaae227169e69fea254a848ce1313f4491f53b1 Author: Michał Górny gentoo org> AuthorDate: Sun Nov 27 12:30:35 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Nov 30 09:42:07 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beaae227 dev-util/cmake: Support indicating Gentoo build via CMAKE_GENTOO_BUILD Support indicating Gentoo package build using a new CMAKE_GENTOO_BUILD CMake variable, as an alternative to relying on CMAKE_BUILD_TYPE being equal to Gentoo. This makes it possible to reduce reliance on a custom build type in the future. dev-util/cmake/{cmake-3.7.0.ebuild => cmake-3.7.0-r1.ebuild} | 0 dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch | 2 +- dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch | 4 ++-- dev-util/cmake/files/cmake-3.5.2-FindQt4.patch | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-util/cmake/cmake-3.7.0.ebuild b/dev-util/cmake/cmake-3.7.0-r1.ebuild similarity index 100% rename from dev-util/cmake/cmake-3.7.0.ebuild rename to dev-util/cmake/cmake-3.7.0-r1.ebuild diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch index 2a83ff7..5f9c266 100644 --- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch +++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch @@ -7,7 +7,7 @@ index bffa9fb..8fc90ee 100644 ) +# Gentoo portage requires that you use exactly the given python version -+if (CMAKE_BUILD_TYPE STREQUAL Gentoo) ++if (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo) + execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" + OUTPUT_VARIABLE _Gentoo_Python_VERSION) + list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX) diff --git a/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch b/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch index 3abb2e4..bb3ca95 100644 --- a/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch +++ b/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch @@ -5,7 +5,7 @@ set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS}) endif() + -+if (CMAKE_BUILD_TYPE STREQUAL Gentoo) ++if (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo) + set(_Python_NAMES python) +endif() + @@ -17,7 +17,7 @@ # Search for newest python version if python executable isn't found -if(NOT PYTHON_EXECUTABLE) -+if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo) ++if(NOT PYTHON_EXECUTABLE AND NOT (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo)) foreach(_CURRENT_VERSION IN LISTS _Python_VERSIONS) set(_Python_NAMES python${_CURRENT_VERSION}) if(WIN32) diff --git a/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch b/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch index 845fc6e..2f2764d 100644 --- a/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch +++ b/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch @@ -23,7 +23,7 @@ Gentoo-bug: 547222 - PATH_SUFFIXES bin - DOC "The qmake executable for the Qt installation to use" - ) -+ if(CMAKE_BUILD_TYPE STREQUAL Gentoo) ++ if(CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo) + find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME} + PATHS + $ENV{EPREFIX}/usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin