From 3da84d425bbdedd86bffb2b54cc877423a5731a3 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 27 Feb 2015 10:38:48 +0100 Subject: [PATCH] gmock: resolve file conflict with gtext --- srcpkgs/gmock/template | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gmock/template b/srcpkgs/gmock/template index ddcd3ca25f..c1e4058753 100644 --- a/srcpkgs/gmock/template +++ b/srcpkgs/gmock/template @@ -1,20 +1,29 @@ # Template build file for 'gmock' pkgname=gmock version=1.7.0 -revision=4 +revision=5 build_style=gnu-configure short_desc="Google C++ Mocking Framework" maintainer="Enno Boland " license="BSD" hostmakedepends="unzip" +makedepends="gtest-devel" +depends="gtest" homepage="https://code.google.com/p/googlemock" distfiles="https://googlemock.googlecode.com/files/${pkgname}-${version}.zip" checksum=26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b -configure_args="--enable-external-gtest" + +post_install() { + # gmock is unable to detect the systems gtest, therefore delete the included + # version of gtest explicitly. + rm -r $DESTDIR/usr/lib/libgtest*.{so*,a} \ + $DESTDIR/usr/share/aclocal/gtest.m4 \ + $DESTDIR/usr/include/gtest +} gmock-devel_package() { conflicts="gtest-devel>=0" - depends="gmock>=${version}_${revision}" + depends="gmock>=${version}_${revision} gtest-devel" short_desc+=" - development files" pkg_install() { vmove usr/include