diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2013-07-17 21:55:34 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2013-07-17 21:55:34 +0000 |
| commit | 039fdfad645abfee1391e0f0c7f17dbf044da9b3 (patch) | |
| tree | 61d157f2d3dbf2307b690ab444e9005638d293e2 /dev-util/apitrace | |
| parent | version bump (diff) | |
| download | gentoo-2-039fdfad645abfee1391e0f0c7f17dbf044da9b3.tar.gz gentoo-2-039fdfad645abfee1391e0f0c7f17dbf044da9b3.tar.bz2 gentoo-2-039fdfad645abfee1391e0f0c7f17dbf044da9b3.zip | |
Use cmake-utils_src_prepare instead of base_src_prepare (bug #477228) and replace CMAKE_BUILD_DIR with BUILD_DIR.
(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'dev-util/apitrace')
| -rw-r--r-- | dev-util/apitrace/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/apitrace/apitrace-3.0-r1.ebuild | 16 |
2 files changed, 13 insertions, 9 deletions
diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog index d9695bca173d..765e3a76f59c 100644 --- a/dev-util/apitrace/ChangeLog +++ b/dev-util/apitrace/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/apitrace # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.16 2013/04/11 11:44:52 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.17 2013/07/17 21:55:34 radhermit Exp $ + + 17 Jul 2013; Tim Harder <radhermit@gentoo.org> apitrace-3.0-r1.ebuild: + Use cmake-utils_src_prepare instead of base_src_prepare (bug #477228) and + replace CMAKE_BUILD_DIR with BUILD_DIR. 11 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> apitrace-3.0-r1.ebuild, +files/apitrace-3.0-memcpy.patch: diff --git a/dev-util/apitrace/apitrace-3.0-r1.ebuild b/dev-util/apitrace/apitrace-3.0-r1.ebuild index 34c5e00af58f..4482ebb8b029 100644 --- a/dev-util/apitrace/apitrace-3.0-r1.ebuild +++ b/dev-util/apitrace/apitrace-3.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/apitrace-3.0-r1.ebuild,v 1.5 2013/04/11 11:44:52 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/apitrace-3.0-r1.ebuild,v 1.6 2013/07/17 21:55:34 radhermit Exp $ EAPI="5" PYTHON_DEPEND="2:2.6" @@ -48,7 +48,7 @@ pkg_setup() { } src_prepare() { - base_src_prepare + cmake-utils_src_prepare # Workaround NULL DT_RPATH issues sed -i -e "s/install (TARGETS/#\0/" gui/CMakeLists.txt || die @@ -72,7 +72,7 @@ src_configure() { multilib_toolchain_setup ${ABI} fi - CMAKE_BUILD_DIR="${WORKDIR}/${P}_build-${ABI}" + BUILD_DIR="${WORKDIR}/${P}_build-${ABI}" cmake-utils_src_configure done } @@ -80,19 +80,19 @@ src_configure() { src_compile() { for ABI in $(get_install_abis) ; do use multilib && multilib_toolchain_setup ${ABI} - CMAKE_BUILD_DIR="${WORKDIR}/${P}_build-${ABI}" + BUILD_DIR="${WORKDIR}/${P}_build-${ABI}" cmake-utils_src_compile done } src_install() { - dobin "${CMAKE_BUILD_DIR}"/{glretrace,apitrace} - use qt4 && dobin "${CMAKE_BUILD_DIR}"/qapitrace + dobin "${BUILD_DIR}"/{glretrace,apitrace} + use qt4 && dobin "${BUILD_DIR}"/qapitrace for ABI in $(get_install_abis) ; do - CMAKE_BUILD_DIR="${WORKDIR}/${P}_build-${ABI}" + BUILD_DIR="${WORKDIR}/${P}_build-${ABI}" exeinto /usr/$(get_libdir)/${PN}/wrappers - doexe "${CMAKE_BUILD_DIR}"/wrappers/*.so + doexe "${BUILD_DIR}"/wrappers/*.so dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1 dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2 |