mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-16 14:29:05 -07:00
dev-cpp/gmock: treeclean
This commit is contained in:
@@ -1 +0,0 @@
|
||||
DIST gmock-1.7.0.zip 2167746 BLAKE2B fc8939615d076512181c62e87028f55ac962a462a625faa4dbf4e8368dc59949f38413293e941c02e21c459190a8678f6618f252364d288b1d2323bcd19bd525 SHA512 0ab7bb2614f8c00e4842a6819dbc6d9323c42241335078c23eaee53ed420d42f1845d44334eccbf7c114cc88f6ac7a493e20d9b46c58cdba645bbd400eb6db55
|
||||
@@ -1,32 +0,0 @@
|
||||
Bug: https://bugs.gentoo.org/602158
|
||||
Patch: https://github.com/google/googletest/issues/705#issuecomment-235067917
|
||||
|
||||
--- a/include/gmock/gmock-spec-builders.h
|
||||
+++ b/include/gmock/gmock-spec-builders.h
|
||||
@@ -1370,6 +1370,8 @@
|
||||
template <>
|
||||
class ActionResultHolder<void> : public UntypedActionResultHolderBase {
|
||||
public:
|
||||
+ explicit ActionResultHolder() {}
|
||||
+
|
||||
void GetValueAndDelete() const { delete this; }
|
||||
|
||||
virtual void PrintAsActionResult(::std::ostream* /* os */) const {}
|
||||
@@ -1381,7 +1383,7 @@
|
||||
const typename Function<F>::ArgumentTuple& args,
|
||||
const string& call_description) {
|
||||
func_mocker->PerformDefaultAction(args, call_description);
|
||||
- return NULL;
|
||||
+ return new ActionResultHolder();
|
||||
}
|
||||
|
||||
// Performs the given action and returns NULL.
|
||||
@@ -1390,7 +1392,7 @@
|
||||
const Action<F>& action,
|
||||
const typename Function<F>::ArgumentTuple& args) {
|
||||
action.Perform(args);
|
||||
- return NULL;
|
||||
+ return new ActionResultHolder();
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="4"
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit epatch libtool multilib-minimal python-any-r1
|
||||
|
||||
DESCRIPTION="Google's C++ mocking framework"
|
||||
HOMEPAGE="https://github.com/google/googlemock"
|
||||
SRC_URI="https://googlemock.googlecode.com/files/${P}.zip"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
|
||||
IUSE="static-libs test"
|
||||
|
||||
RDEPEND="=dev-cpp/gtest-${PV}*[${MULTILIB_USEDEP}]"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( ${PYTHON_DEPS} )
|
||||
app-arch/unzip"
|
||||
|
||||
pkg_setup() {
|
||||
# Stub to disable python_setup running when USE=-test.
|
||||
# We'll handle it down in src_test ourselves.
|
||||
:
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
# make sure we always use the system one
|
||||
rm -r "${S}"/gtest/{Makefile,configure}* || die
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-gcc6.patch
|
||||
|
||||
sed -i -r \
|
||||
-e '/^install-(data|exec)-local:/s|^.*$|&\ndisabled-&|' \
|
||||
Makefile.in
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
ECONF_SOURCE=${S} econf $(use_enable static-libs static)
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
python_setup
|
||||
emake check
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
default
|
||||
dobin scripts/gmock-config
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
use static-libs || find "${ED}" -name '*.la' -delete
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<!-- maintainer-needed -->
|
||||
<upstream>
|
||||
<remote-id type="google-code">googlemock</remote-id>
|
||||
<remote-id type="github">google/googlemock</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
Reference in New Issue
Block a user