| 1 |
commit: d0377b4efe4377477bc44cdd028ce7ad0b54f8ac |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Sun May 27 08:17:52 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 15 11:43:35 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0377b4e |
| 7 |
|
| 8 |
cmake-utils.eclass: Drop remaining support for <cmake-3.4.0_rc1 |
| 9 |
|
| 10 |
Default value of CMAKE_MIN_VERSION is already set to "3.9.6". |
| 11 |
|
| 12 |
eclass/cmake-utils.eclass | 31 +++++-------------------------- |
| 13 |
1 file changed, 5 insertions(+), 26 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
| 16 |
index 31ee9c51072..6dfeb083d8b 100644 |
| 17 |
--- a/eclass/cmake-utils.eclass |
| 18 |
+++ b/eclass/cmake-utils.eclass |
| 19 |
@@ -517,35 +517,14 @@ cmake-utils_src_configure() { |
| 20 |
|
| 21 |
# Prepare Gentoo override rules (set valid compiler, append CPPFLAGS etc.) |
| 22 |
local build_rules=${BUILD_DIR}/gentoo_rules.cmake |
| 23 |
- # Since cmake-3.4.0_rc1 "<FLAGS>" no longer contains includes and thus |
| 24 |
- # we need to add "<INCLUDES>" |
| 25 |
- local includes= |
| 26 |
- |
| 27 |
- local has_cmake_3_4_0=false |
| 28 |
- case ${EAPI} in |
| 29 |
- 5|6) |
| 30 |
- ROOT=/ has_version ">=dev-util/cmake-3.4.0_rc1" && has_cmake_3_4_0=true |
| 31 |
- ;; |
| 32 |
- *) |
| 33 |
- has_version -b ">=dev-util/cmake-3.4.0_rc1" && has_cmake_3_4_0=true |
| 34 |
- ;; |
| 35 |
- esac |
| 36 |
|
| 37 |
- |
| 38 |
- if [[ ${PN} == cmake ]] ; then |
| 39 |
- if $(ver_test $(ver_cut 1-3 ${PV}) -ge 3.4.0) ; then |
| 40 |
- includes="<INCLUDES>" |
| 41 |
- fi |
| 42 |
- elif ${has_cmake_3_4_0}; then |
| 43 |
- includes="<INCLUDES>" |
| 44 |
- fi |
| 45 |
cat > "${build_rules}" <<- _EOF_ || die |
| 46 |
- SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE) |
| 47 |
- SET (CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM-ATT_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c -x assembler <SOURCE>" CACHE STRING "ASM-ATT compile command" FORCE) |
| 48 |
+ SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE) |
| 49 |
+ SET (CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM-ATT_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c -x assembler <SOURCE>" CACHE STRING "ASM-ATT compile command" FORCE) |
| 50 |
SET (CMAKE_ASM-ATT_LINK_FLAGS "-nostdlib" CACHE STRING "ASM-ATT link flags" FORCE) |
| 51 |
- SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE) |
| 52 |
- SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE) |
| 53 |
- SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE) |
| 54 |
+ SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE) |
| 55 |
+ SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE) |
| 56 |
+ SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> <INCLUDES> ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE) |
| 57 |
_EOF_ |
| 58 |
|
| 59 |
local myCC=$(tc-getCC) myCXX=$(tc-getCXX) myFC=$(tc-getFC) |
Archives