From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SJjB8-0000uP-2f for garchives@archives.gentoo.org; Mon, 16 Apr 2012 10:29:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE793E0AC3; Mon, 16 Apr 2012 10:28:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8F83AE0AC3 for ; Mon, 16 Apr 2012 10:28:49 +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 BEFB01B407C for ; Mon, 16 Apr 2012 10:28:48 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2230) id 77E8F2004B; Mon, 16 Apr 2012 10:28:47 +0000 (UTC) From: "Tomas Chvatal (scarabeus)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, scarabeus@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: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Message-Id: <20120416102847.77E8F2004B@flycatcher.gentoo.org> Date: Mon, 16 Apr 2012 10:28: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 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: feed1d00-7f88-48a4-a364-fc11e1e350a5 X-Archives-Hash: 8e686078a97be95d8e5c65fbde59132c scarabeus 12/04/16 10:28:47 Modified: ChangeLog cmake-utils.eclass Log: Whitespace cmake dep. Add build_rules to CMAKE_BUILD_DIR rather than to= T as they might vary for multiple abi builds. Create the CMAKE_BUILD_DIR= right away when determined. Revision Changes Path 1.213 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= ev=3D1.213&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= ev=3D1.213&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= 1=3D1.212&r2=3D1.213 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.212 retrieving revision 1.213 diff -u -r1.212 -r1.213 --- ChangeLog 16 Apr 2012 07:54:18 -0000 1.212 +++ ChangeLog 16 Apr 2012 10:28:47 -0000 1.213 @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.212 2012/04/16 0= 7:54:18 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.213 2012/04/16 1= 0:28:47 scarabeus Exp $ + + 16 Apr 2012; Tom=C3=A1=C5=A1 Chv=C3=A1tal cmake= -utils.eclass: + Whitespace cmake dep. Add build_rules to CMAKE_BUILD_DIR rather than t= o T as + they might vary for multiple abi builds. Create the CMAKE_BUILD_DIR ri= ght + away when determined. =20 16 Apr 2012; Samuli Suominen waf-utils.eclass: Unbreak waf-utils.eclass by restoring --jobs=3D argument wrt #412159 1.78 eclass/cmake-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils= .eclass?rev=3D1.78&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils= .eclass?rev=3D1.78&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils= .eclass?r1=3D1.77&r2=3D1.78 Index: cmake-utils.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- cmake-utils.eclass 21 Jan 2012 23:31:11 -0000 1.77 +++ cmake-utils.eclass 16 Apr 2012 10:28:47 -0000 1.78 @@ -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.77 2012= /01/21 23:31:11 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.78 2012= /04/16 10:28:47 scarabeus Exp $ =20 # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -64,7 +64,7 @@ : ${DESCRIPTION:=3D"Based on the ${ECLASS} eclass"} =20 if [[ ${PN} !=3D cmake ]]; then - CMAKEDEPEND+=3D">=3Ddev-util/cmake-${CMAKE_MIN_VERSION}" + CMAKEDEPEND+=3D" >=3Ddev-util/cmake-${CMAKE_MIN_VERSION}" fi =20 CMAKEDEPEND+=3D" userland_GNU? ( >=3Dsys-apps/findutils-4.4.0 )" @@ -161,6 +161,7 @@ else : ${CMAKE_BUILD_DIR:=3D${WORKDIR}/${P}_build} fi + mkdir -p "${CMAKE_BUILD_DIR}" echo ">>> Working in BUILD_DIR: \"$CMAKE_BUILD_DIR\"" } # @FUNCTION: cmake-utils_use_with @@ -312,7 +313,7 @@ fi =20 # Prepare Gentoo override rules (set valid compiler, append CPPFLAGS) - local build_rules=3D${T}/gentoo_rules.cmake + local build_rules=3D${CMAKE_BUILD_DIR}/gentoo_rules.cmake cat > "${build_rules}" <<- _EOF_ SET (CMAKE_C_COMPILER $(type -P $(tc-getCC)) CACHE FILEPATH "C compile= r" FORCE) SET (CMAKE_C_COMPILE_OBJECT " ${CPPFLAGS} = -o -c " CACHE STRING "C compile command" FORCE) @@ -346,7 +347,7 @@ fi =20 # Common configure parameters (invariants) - local common_config=3D${T}/gentoo_common_config.cmake + local common_config=3D${CMAKE_BUILD_DIR}/gentoo_common_config.cmake local libdir=3D$(get_libdir) cat > "${common_config}" <<- _EOF_ SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE= ) @@ -377,7 +378,6 @@ "${MYCMAKEARGS}" ) =20 - mkdir -p "${CMAKE_BUILD_DIR}" pushd "${CMAKE_BUILD_DIR}" > /dev/null debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: mycmakeargs is ${mycmakea= rgs_local[*]}" echo "${CMAKE_BINARY}" "${cmakeargs[@]}" "${CMAKE_USE_DIR}"