From 9bb0a634add59b849b9a267a5b561aea11288314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20L=C3=B6vqvist?= Date: Sat, 10 Oct 2020 07:34:41 +0200 Subject: [PATCH] Updated search locations for gmock and gtest --- trunk/PKGBUILD | 4 ++-- trunk/use-system-libs.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index 64fd77e..bdb46a8 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -29,7 +29,7 @@ source=(synergy-${pkgver}.tar.gz::https://github.com/symless/synergy-core/archiv synergys.socket synergys.service) sha512sums=('01497fe362395dd9d26d44f7468ca5c01ee7cd2f590b6c28a67e094f969fdca3b8f78570cca4f188c16fc2575ca895daf8d6ffd07378964ed01da1540db05c8e' - '6ed5384ec46e991958f48051c66b87febfb457a748cea48909f87a088c804907f480f123620a0a5921e281ca9871e251de8b7dd5803ffe8566841f68f396c160' + 'eaa6416a5d25b94d0a61e3b4784720591984201e14895dd973de182ede096ad44ecc1f0b2762038249430f291e63275c5ac76ef0e194e41c2ba1c479b0075130' 'b8347b803a7baaeeab75e55778314298fc69e15ccda154a8622b4697c3a3e7d6ba51cb156f06c6b289c41cb0892be7fed5ce49591531ed1ef18fa3a1ec8a7d6d' '89b29994f238013393b90ad628d781ea6ea1d46c33819be561f031cc0790ef7f3860faaa2803e1459ed3c14affb749ea3bab6b15598c760424c8063195cb56a6' '158d218faa8d8c33cbea935a9dcad4bcf79309eb485bfea107cd160f894d1090db6fea6e60827509b985ff9a7493020fc819e5e150bdac85f5547e755f3ad9ec' @@ -38,7 +38,7 @@ sha512sums=('01497fe362395dd9d26d44f7468ca5c01ee7cd2f590b6c28a67e094f969fdca3b8f prepare() { cd synergy-core-${pkgver}-stable - mkdir build + mkdir -p build # get rid of shitty bundled gtest and gmock patch -Np1 < "${srcdir}/use-system-libs.patch" diff --git a/trunk/use-system-libs.patch b/trunk/use-system-libs.patch index 7defda9..c691743 100644 --- a/trunk/use-system-libs.patch +++ b/trunk/use-system-libs.patch @@ -52,13 +52,13 @@ index 1f78ae0..b62f30c 100644 - -add_library(gtest STATIC ../../ext/gtest/src/gtest-all.cc) -add_library(gmock STATIC ../../ext/gmock/src/gmock-all.cc) -+ /usr/src/gtest ++ /usr/src/googletest + /usr/include/gtest + /usr/src/gmock + /usr/include/gmock) + -+add_library(gtest STATIC /usr/src/gtest/src/gtest-all.cc) -+add_library(gmock STATIC /usr/src/gmock/gmock-all.cc) ++add_library(gtest STATIC /usr/src/googletest/src/gtest-all.cc) ++add_library(gmock STATIC /usr/src/gmock/src/gmock-all.cc) if (UNIX) # ignore warnings in gtest and gmock -- 2.28.0