hasufell 14/06/11 17:48:09
Modified: libRocket-1.2.1_p20130110-r1.ebuild ChangeLog
libRocket-9999.ebuild
Log:
fix build wrt #512956
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
BDEED020)
Revision Changes Path
1.6 dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild?r1=1.5&r2=1.6
Index: libRocket-1.2.1_p20130110-r1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libRocket-1.2.1_p20130110-r1.ebuild 28 Apr 2014 17:31:40 -0000 1.5
+++ libRocket-1.2.1_p20130110-r1.ebuild 11 Jun 2014 17:48:08 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild,v
1.5 2014/04/28 17:31:40 mgorny Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild,v
1.6 2014/06/11 17:48:08 hasufell Exp $
EAPI=5
@@ -66,11 +66,12 @@
multilib_src_compile() {
cmake-utils_src_compile
+ local abi_build_dir=${BUILD_DIR}
if multilib_is_native_abi ; then
if use python ; then
buildpybind() {
- cp
"${S}-${ABI}"/{libRocketCore*,libRocketControls*}
"${python_BUILD_DIR}-${EPYTHON}"/ || die
+ cp
"${abi_build_dir}"/{libRocketCore*,libRocketControls*}
"${python_BUILD_DIR}-${EPYTHON}"/ || die
BUILD_DIR="${python_BUILD_DIR}-${EPYTHON}"
cmake-utils_src_make _rocketcontrols/fast _rocketcore/fast
}
einfo "compiling python binding"
1.11 dev-libs/libRocket/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libRocket/ChangeLog?rev=1.11&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libRocket/ChangeLog?rev=1.11&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libRocket/ChangeLog?r1=1.10&r2=1.11
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libRocket/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog 28 Apr 2014 17:31:41 -0000 1.10
+++ ChangeLog 11 Jun 2014 17:48:08 -0000 1.11
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/libRocket
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/ChangeLog,v 1.10
2014/04/28 17:31:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/ChangeLog,v 1.11
2014/06/11 17:48:08 hasufell Exp $
+
+ 11 Jun 2014; Julian Ospald <[email protected]>
+ libRocket-1.2.1_p20130110-r1.ebuild, libRocket-9999.ebuild:
+ fix build wrt #512956
28 Apr 2014; Michał Górny <[email protected]>
libRocket-1.2.1_p20130110-r1.ebuild, libRocket-9999.ebuild:
1.8 dev-libs/libRocket/libRocket-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libRocket/libRocket-9999.ebuild?rev=1.8&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libRocket/libRocket-9999.ebuild?rev=1.8&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libRocket/libRocket-9999.ebuild?r1=1.7&r2=1.8
Index: libRocket-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-9999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libRocket-9999.ebuild 28 Apr 2014 17:31:40 -0000 1.7
+++ libRocket-9999.ebuild 11 Jun 2014 17:48:09 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-9999.ebuild,v
1.7 2014/04/28 17:31:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-9999.ebuild,v
1.8 2014/06/11 17:48:09 hasufell Exp $
EAPI=5
@@ -67,11 +67,12 @@
multilib_src_compile() {
cmake-utils_src_compile
+ local abi_build_dir=${BUILD_DIR}
if multilib_is_native_abi ; then
if use python ; then
buildpybind() {
- cp
"${S}-${ABI}"/{libRocketCore*,libRocketControls*}
"${python_BUILD_DIR}-${EPYTHON}"/ || die
+ cp
"${abi_build_dir}"/{libRocketCore*,libRocketControls*}
"${python_BUILD_DIR}-${EPYTHON}"/ || die
BUILD_DIR="${python_BUILD_DIR}-${EPYTHON}"
cmake-utils_src_make _rocketcontrols/fast _rocketcore/fast
}
einfo "compiling python binding"
