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 49F791382C5 for ; Sat, 17 Mar 2018 00:18:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A32EE0883; Sat, 17 Mar 2018 00:18:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 2056BE0883 for ; Sat, 17 Mar 2018 00:18:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 CC8FE335C8D for ; Sat, 17 Mar 2018 00:18:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 81057232 for ; Sat, 17 Mar 2018 00:18:00 +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: <1521245867.460ffd9c15ee42497bf7a802d097915b71479dd8.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: 460ffd9c15ee42497bf7a802d097915b71479dd8 X-VCS-Branch: master Date: Sat, 17 Mar 2018 00:18:00 +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: ea9995a8-475e-4193-a97f-c2f6ed814d12 X-Archives-Hash: a7eb46cdde4708aac9816c8cbf3566bd commit: 460ffd9c15ee42497bf7a802d097915b71479dd8 Author: Michał Górny gentoo org> AuthorDate: Sun Feb 25 09:06:06 2018 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sat Mar 17 00:17:47 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=460ffd9c cmake-utils.eclass: Extend ASM rules to ASM-ATT Some CMake projects use ASM-ATT rather than ASM, so extend our rule overrides to that. Closes: https://bugs.gentoo.org/625844 eclass/cmake-utils.eclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 5d89de88ed..6d5ded8f90 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -520,6 +520,7 @@ cmake-utils_src_configure() { fi cat > "${build_rules}" <<- _EOF_ || die SET (CMAKE_ASM_COMPILE_OBJECT " ${includes} ${CPPFLAGS} -o -c " CACHE STRING "ASM compile command" FORCE) + SET (CMAKE_ASM-ATT_COMPILE_OBJECT " ${includes} ${CPPFLAGS} -o -c " CACHE STRING "ASM compile command" FORCE) SET (CMAKE_C_COMPILE_OBJECT " ${includes} ${CPPFLAGS} -o -c " CACHE STRING "C compile command" FORCE) SET (CMAKE_CXX_COMPILE_OBJECT " ${includes} ${CPPFLAGS} -o -c " CACHE STRING "C++ compile command" FORCE) SET (CMAKE_Fortran_COMPILE_OBJECT " ${includes} ${FCFLAGS} -o -c " CACHE STRING "Fortran compile command" FORCE) @@ -535,6 +536,7 @@ cmake-utils_src_configure() { local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake cat > ${toolchain_file} <<- _EOF_ || die SET (CMAKE_ASM_COMPILER "${myCC/ /;}") + SET (CMAKE_ASM-ATT_COMPILER "${myCC/ /;}") SET (CMAKE_C_COMPILER "${myCC/ /;}") SET (CMAKE_CXX_COMPILER "${myCXX/ /;}") SET (CMAKE_Fortran_COMPILER "${myFC/ /;}") @@ -615,6 +617,7 @@ cmake-utils_src_configure() { if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then cat >> ${common_config} <<- _EOF_ || die SET (CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") + SET (CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") SET (CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") SET (CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") SET (CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")