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 9BB8C1381F4 for ; Sat, 8 Dec 2012 15:58:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1D4621C016; Sat, 8 Dec 2012 15:58:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 17A2F21C016 for ; Sat, 8 Dec 2012 15:58:50 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F038E33E1C0 for ; Sat, 8 Dec 2012 15:58:48 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2323) id B92792171D; Sat, 8 Dec 2012 15:58:47 +0000 (UTC) From: "Michael Palimaka (kensington)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, kensington@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog cmake-utils.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog cmake-utils.eclass X-VCS-Directories: eclass X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20121208155847.B92792171D@flycatcher.gentoo.org> Date: Sat, 8 Dec 2012 15:58:47 +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: 97e2cff6-7eb7-461e-8fa4-dd40f432e426 X-Archives-Hash: d6160b817f3e269275eca8d081b8ad2b kensington 12/12/08 15:58:47 Modified: ChangeLog cmake-utils.eclass Log: Respect ASMFLAGS, wrt bug #432480. Permit ebuilds to define 'myctestargs'. Revision Changes Path 1.554 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.554&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.554&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.553&r2=1.554 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.553 retrieving revision 1.554 diff -u -r1.553 -r1.554 --- ChangeLog 7 Dec 2012 22:23:04 -0000 1.553 +++ ChangeLog 8 Dec 2012 15:58:47 -0000 1.554 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.553 2012/12/07 22:23:04 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.554 2012/12/08 15:58:47 kensington Exp $ + + 08 Dec 2012; Michael Palimaka cmake-utils.eclass: + Respect ASMFLAGS, wrt bug #432480. Permit ebuilds to define 'myctestargs'. 07 Dec 2012; Michał Górny distutils-r1.eclass: Use separate TMPDIR for each Python implementation. 1.90 eclass/cmake-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.90&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.90&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?r1=1.89&r2=1.90 Index: cmake-utils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- cmake-utils.eclass 3 Dec 2012 12:05:51 -0000 1.89 +++ cmake-utils.eclass 8 Dec 2012 15:58:47 -0000 1.90 @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.89 2012/12/03 12:05:51 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.90 2012/12/08 15:58:47 kensington Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -353,6 +353,7 @@ local build_rules=${BUILD_DIR}/gentoo_rules.cmake cat > "${build_rules}" <<- _EOF_ 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_COMPILER $(type -P $(tc-getCC)) CACHE FILEPATH "C compiler" FORCE) SET (CMAKE_C_COMPILE_OBJECT " ${CPPFLAGS} -o -c " CACHE STRING "C compile command" FORCE) SET (CMAKE_CXX_COMPILER $(type -P $(tc-getCXX)) CACHE FILEPATH "C++ compiler" FORCE) @@ -486,15 +487,14 @@ enable_cmake-utils_src_test() { debug-print-function ${FUNCNAME} "$@" - local ctestargs _check_build_dir pushd "${BUILD_DIR}" > /dev/null [[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; return 0 ; } - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" + [[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure ) - if ctest ${ctestargs} "$@" ; then + if ctest "${myctestargs[@]}" "$@" ; then einfo "Tests succeeded." popd > /dev/null return 0