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 D26E113888F for ; Thu, 15 Oct 2015 11:34:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A717E0896; Thu, 15 Oct 2015 11:34:08 +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 F117CE0896 for ; Thu, 15 Oct 2015 11:34:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D6A72340BC6 for ; Thu, 15 Oct 2015 11:34:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 90DAC10C4 for ; Thu, 15 Oct 2015 11:34:04 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1444908837.94966c2b0ec9051b933228fa2120f45d1ff37d2a.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/cmake-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 94966c2b0ec9051b933228fa2120f45d1ff37d2a X-VCS-Branch: master Date: Thu, 15 Oct 2015 11:34:04 +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: 0161bea6-312f-4f73-a1c5-7bc5992bd95f X-Archives-Hash: 66ba42314b4224c7e4ea6b59cc81aca5 commit: 94966c2b0ec9051b933228fa2120f45d1ff37d2a Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 15 11:16:42 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 15 11:33:57 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=94966c2b cmake-utils.eclass: make heredocs die eclass/cmake-utils.eclass | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 89db00d..480cd09 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -375,7 +375,7 @@ _modify-cmakelists() { || die "${LINENO}: failed to disable hardcoded settings" # NOTE Append some useful summary here - cat >> "${CMAKE_USE_DIR}"/CMakeLists.txt <<- _EOF_ + cat >> "${CMAKE_USE_DIR}"/CMakeLists.txt <<- _EOF_ || die MESSAGE(STATUS "<<< Gentoo configuration >>> Build type \${CMAKE_BUILD_TYPE} @@ -456,7 +456,7 @@ enable_cmake-utils_src_configure() { # Prepare Gentoo override rules (set valid compiler, append CPPFLAGS etc.) local build_rules=${BUILD_DIR}/gentoo_rules.cmake - cat > "${build_rules}" <<- _EOF_ + cat > "${build_rules}" <<- _EOF_ || die SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE) SET (CMAKE_ASM_COMPILE_OBJECT " ${CFLAGS} -o -c " CACHE STRING "ASM compile command" FORCE) SET (CMAKE_C_COMPILE_OBJECT " ${CPPFLAGS} -o -c " CACHE STRING "C compile command" FORCE) @@ -467,7 +467,7 @@ enable_cmake-utils_src_configure() { _EOF_ local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake - cat > ${toolchain_file} <<- _EOF_ + cat > ${toolchain_file} <<- _EOF_ || die SET (CMAKE_C_COMPILER $(tc-getCC)) SET (CMAKE_CXX_COMPILER $(tc-getCXX)) SET (CMAKE_Fortran_COMPILER $(tc-getFC)) @@ -481,21 +481,21 @@ enable_cmake-utils_src_configure() { linux) sysname="Linux" ;; Winnt) sysname="Windows" - cat >> "${toolchain_file}" <<- _EOF_ + cat >> "${toolchain_file}" <<- _EOF_ || die SET (CMAKE_RC_COMPILER $(tc-getRC)) _EOF_ ;; *) sysname="${KERNEL}" ;; esac - cat >> "${toolchain_file}" <<- _EOF_ + cat >> "${toolchain_file}" <<- _EOF_ || die SET (CMAKE_SYSTEM_NAME "${sysname}") _EOF_ if [ "${SYSROOT:-/}" != "/" ] ; then # When cross-compiling with a sysroot (e.g. with crossdev's emerge wrappers) # we need to tell cmake to use libs/headers from the sysroot but programs from / only. - cat >> "${toolchain_file}" <<- _EOF_ + cat >> "${toolchain_file}" <<- _EOF_ || die set(CMAKE_FIND_ROOT_PATH "${SYSROOT}") set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) @@ -507,7 +507,7 @@ enable_cmake-utils_src_configure() { has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= if [[ ${EPREFIX} ]]; then - cat >> "${build_rules}" <<- _EOF_ + cat >> "${build_rules}" <<- _EOF_ || die # in Prefix we need rpath and must ensure cmake gets our default linker path # right ... except for Darwin hosts IF (NOT APPLE) @@ -532,7 +532,7 @@ enable_cmake-utils_src_configure() { # Common configure parameters (invariants) local common_config=${BUILD_DIR}/gentoo_common_config.cmake local libdir=$(get_libdir) - cat > "${common_config}" <<- _EOF_ + cat > "${common_config}" <<- _EOF_ || die SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE) SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries") _EOF_