diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2012-12-08 15:58:47 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2012-12-08 15:58:47 +0000 |
| commit | 59f3c2706f1c941fbdd1392c9a2f3f4b4bc9f6fc (patch) | |
| tree | 4b31c855040cbe00006d68fd989a23dc4946c348 /eclass | |
| parent | Stable for ppc64, wrt bug #441050 (diff) | |
| download | gentoo-2-59f3c2706f1c941fbdd1392c9a2f3f4b4bc9f6fc.tar.gz gentoo-2-59f3c2706f1c941fbdd1392c9a2f3f4b4bc9f6fc.tar.bz2 gentoo-2-59f3c2706f1c941fbdd1392c9a2f3f4b4bc9f6fc.zip | |
Respect ASMFLAGS, wrt bug #432480. Permit ebuilds to define 'myctestargs'.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/cmake-utils.eclass | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 3c2e6be8b7ae..15b2e1d3c308 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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 <kensington@gentoo.org> cmake-utils.eclass: + Respect ASMFLAGS, wrt bug #432480. Permit ebuilds to define 'myctestargs'. 07 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass: Use separate TMPDIR for each Python implementation. diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index c4baa23035cf..43a933e7bcef 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -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 @@ enable_cmake-utils_src_configure() { 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 "<CMAKE_C_COMPILER> <DEFINES> ${CFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE) SET (CMAKE_C_COMPILER $(type -P $(tc-getCC)) CACHE FILEPATH "C compiler" FORCE) SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" 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_install() { 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 |