commit: e63c09a12fba1f6506fb92344f6f43e465caa55c
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon May 9 03:25:31 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon May 9 03:26:33 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e63c09a1
sys-block/thin-provisioning-tools: fix test builds #493440
.../thin-provisioning-tools/thin-provisioning-tools-0.4.1.ebuild | 7 ++++++-
.../thin-provisioning-tools/thin-provisioning-tools-0.5.3.ebuild | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git
a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.4.1.ebuild
b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.4.1.ebuild
index a1b9843..0c0849f 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.4.1.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.4.1.ebuild
@@ -22,7 +22,8 @@ RDEPEND="dev-libs/expat
DEPEND="${RDEPEND}
test? (
|| ( dev-lang/ruby:2.9 dev-lang/ruby:2.8 dev-lang/ruby:2.7
dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3
dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9
dev-lang/ruby:1.8 )
- dev-cpp/gmock
+ >=dev-cpp/gmock-1.6
+ >=dev-cpp/gtest-1.6
dev-util/cucumber
dev-util/aruba
)
@@ -30,6 +31,10 @@ DEPEND="${RDEPEND}
src_prepare() {
sed -i -e '/^INSTALL_PROGRAM/s:-s::' Makefile.in || die
+ sed -i \
+ -e '/^unit-tests\/unit_tests:/s:lib/libgmock.a::' \
+ -e '/-lgmock/s:$: -lgtest:' \
+ unit-tests/Makefile.in || die #493440
epatch_user
eautoreconf
}
diff --git
a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.5.3.ebuild
b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.5.3.ebuild
index ec9da43..e896109 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.5.3.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.5.3.ebuild
@@ -23,7 +23,8 @@ DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )
test? (
|| ( dev-lang/ruby:2.9 dev-lang/ruby:2.8 dev-lang/ruby:2.7
dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3
dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 )
- dev-cpp/gmock
+ >=dev-cpp/gmock-1.6
+ >=dev-cpp/gtest-1.6
dev-util/cucumber
dev-util/aruba
)
@@ -31,6 +32,10 @@ DEPEND="${RDEPEND}
src_prepare() {
sed -i -e '/^INSTALL_PROGRAM/s:-s::' Makefile.in || die
+ sed -i \
+ -e '/^unit-tests\/unit_tests:/s:lib/libgmock.a::' \
+ -e '/-lgmock/s:$: -lgtest:' \
+ unit-tests/Makefile.in || die #493440
epatch_user
eautoreconf
}