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 1PYJPK-0008DS-At for garchives@archives.gentoo.org; Thu, 30 Dec 2010 14:23:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51D2EE04D6; Thu, 30 Dec 2010 14:23:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2143CE04D6 for ; Thu, 30 Dec 2010 14:23:03 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 80FF71B4123 for ; Thu, 30 Dec 2010 14:23:02 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2237) id 2AF5F20054; Thu, 30 Dec 2010 14:23:01 +0000 (UTC) From: "Theo Chatzimichos (tampakrap)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, tampakrap@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: cmake-utils.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: cmake-utils.eclass X-VCS-Directories: eclass X-VCS-Committer: tampakrap X-VCS-Committer-Name: Theo Chatzimichos Content-Type: text/plain; charset=utf8 Message-Id: <20101230142301.2AF5F20054@flycatcher.gentoo.org> Date: Thu, 30 Dec 2010 14:23:01 +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: f1c7d6b5-336e-41ed-99f1-14e66a1cc4d4 X-Archives-Hash: 42deeed6eff45d7768a60906a3a6e46a tampakrap 10/12/30 14:23:01 Modified: cmake-utils.eclass Log: Add patch for OS X, written by Mike Lewis, bug 298121 Revision Changes Path 1.62 eclass/cmake-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils= .eclass?rev=3D1.62&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils= .eclass?rev=3D1.62&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils= .eclass?r1=3D1.61&r2=3D1.62 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.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- cmake-utils.eclass 16 Dec 2010 14:36:55 -0000 1.61 +++ cmake-utils.eclass 30 Dec 2010 14:23:01 -0000 1.62 @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.61 2010= /12/16 14:36:55 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.62 2010= /12/30 14:23:01 tampakrap Exp $ =20 # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -309,6 +309,17 @@ SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE) SET (CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH "${EPREFIX}/usr/${CHOST}/li= b/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}= /$(get_libdir)" CACHE STRING "" FORCE) + + ELSE () + + SET(CMAKE_PREFIX_PATH "${EPREFIX}${PREFIX:-/usr}" CACHE STRING ""FORC= E) + SET(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE) + SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE) + SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE CACHE BOOL "" FORCE)=20 + SET(CMAKE_INSTALL_RPATH ${EPREFIX}${PREFIX:-/usr}/lib;${EPREFIX}/usr/= ${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir)= ;${EPREFIX}/$(get_libdir)"CACHE STRING "" FORCE) + SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE) + SET(CMAKE_INSTALL_NAME_DIR "${EPREFIX}${PREFIX:-/usr}/lib" CACHE STRI= NG "" FORCE) + ENDIF (NOT APPLE) _EOF_ fi