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 D44261387AB for ; Sat, 25 Jan 2014 04:07:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADDB0E0B73; Sat, 25 Jan 2014 04:07:07 +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 292EDE0B73 for ; Sat, 25 Jan 2014 04:07:07 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D579433D977 for ; Sat, 25 Jan 2014 04:07:05 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2304) id 9E60F2004C; Sat, 25 Jan 2014 04:07:04 +0000 (UTC) From: "Mike Gilbert (floppym)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, floppym@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: floppym X-VCS-Committer-Name: Mike Gilbert Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20140125040704.9E60F2004C@flycatcher.gentoo.org> Date: Sat, 25 Jan 2014 04:07: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: ab8a6bba-29b6-481d-9b14-c2940e178eb1 X-Archives-Hash: 7a6dca9aa6b0171846e9a103f4bf62ed floppym 14/01/25 04:07:04 Modified: ChangeLog cmake-utils.eclass Log: Improve support for ninja, bug 490280. Revision Changes Path 1.1130 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1130&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1130&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1129&r2=1.1130 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1129 retrieving revision 1.1130 diff -u -r1.1129 -r1.1130 --- ChangeLog 24 Jan 2014 13:51:18 -0000 1.1129 +++ ChangeLog 25 Jan 2014 04:07:04 -0000 1.1130 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1129 2014/01/24 13:51:18 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1130 2014/01/25 04:07:04 floppym Exp $ + + 25 Jan 2014; Mike Gilbert cmake-utils.eclass: + Improve support for ninja, bug 490280. 24 Jan 2014; Joerg Bornkessel vdr-plugin-2.eclass: changed debug info in vdr-plugin-2_src_install for Makefile handling 1.102 eclass/cmake-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.102&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.102&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?r1=1.101&r2=1.102 Index: cmake-utils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- cmake-utils.eclass 24 Dec 2013 14:54:26 -0000 1.101 +++ cmake-utils.eclass 25 Jan 2014 04:07:04 -0000 1.102 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.101 2013/12/24 14:54:26 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.102 2014/01/25 04:07:04 floppym Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -523,6 +523,28 @@ cmake-utils_src_make "$@" } +_ninjaopts_from_makeopts() { + if [[ ${NINJAOPTS+set} == set ]]; then + return 0 + fi + local ninjaopts=() + set -- ${MAKEOPTS} + while (( $# )); do + case $1 in + -j|-l|-k) + ninjaopts+=( $1 $2 ) + shift 2 + ;; + -j*|-l*|-k*) + ninjaopts+=( $1 ) + shift 1 + ;; + *) shift ;; + esac + done + export NINJAOPTS="${ninjaopts[*]}" +} + # @FUNCTION: ninja_src_make # @INTERNAL # @DESCRIPTION: @@ -530,14 +552,18 @@ ninja_src_make() { debug-print-function ${FUNCNAME} "$@" - [[ -e build.ninja ]] || die "Makefile not found. Error during configure stage." + [[ -e build.ninja ]] || die "build.ninja not found. Error during configure stage." - if [[ "${CMAKE_VERBOSE}" != "OFF" ]]; then - # TODO: get load average from portage (-l option) - ninja ${MAKEOPTS} -v "$@" || die + _ninjaopts_from_makeopts + + if [[ "${CMAKE_VERBOSE}" != "OFF" ]]; then + set -- ninja ${NINJAOPTS} -v "$@" else - ninja "$@" || die + set -- ninja ${NINJAOPTS} "$@" fi + + echo "$@" + "$@" || die } # @FUNCTION: emake_src_make @@ -547,11 +573,11 @@ emake_src_make() { debug-print-function ${FUNCNAME} "$@" - [[ -e Makefile ]] || die "Makefile not found. Error during configure stage." + [[ -e Makefile ]] || die "Makefile not found. Error during configure stage." - if [[ "${CMAKE_VERBOSE}" != "OFF" ]]; then + if [[ "${CMAKE_VERBOSE}" != "OFF" ]]; then emake VERBOSE=1 "$@" || die - else + else emake "$@" || die fi