From c1815d9f89e9e955c5186ce869d758f127af01ad Mon Sep 17 00:00:00 2001 From: Sertonix Date: Tue, 30 Jul 2024 22:48:11 +0200 Subject: [PATCH] main/gtest: minor improvments and fixes --- main/gtest/APKBUILD | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/main/gtest/APKBUILD b/main/gtest/APKBUILD index b6a306d5075..527eec76ee9 100644 --- a/main/gtest/APKBUILD +++ b/main/gtest/APKBUILD @@ -8,7 +8,7 @@ arch="all" license="BSD-3-Clause" depends_dev="$pkgname=$pkgver-r$pkgrel gmock=$pkgver-r$pkgrel" makedepends="$depends_dev cmake python3-dev samurai" -subpackages="$pkgname-dev gmock $pkgname-src" +subpackages="$pkgname-dev gmock $pkgname-src::noarch" source="$pkgname-$pkgver.tar.gz::https://github.com/google/googletest/archive/refs/tags/v$pkgver.tar.gz" builddir="$srcdir/googletest-$pkgver" @@ -18,7 +18,6 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=ON \ - -DPYTHON_EXECUTABLE=python3 \ -Dgtest_build_tests=ON \ -DBUILD_GMOCK=ON cmake --build build @@ -36,12 +35,10 @@ package() { gmock() { pkgdesc="Google Mock - A library for writing and using C++ mock classes" - mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/libgmock*.so* "$subpkgdir"/usr/lib/ + amove usr/lib/libgmock'*.so*' } src() { - arch="noarch" mkdir -p "$subpkgdir"/usr/src/$pkgname/src mv "$builddir"/googletest/src/* "$subpkgdir"/usr/src/$pkgname/src }