[arch-commits] Commit in gtest/repos/community-x86_64 (4 files)
Levente Polyak
anthraxx at archlinux.org
Wed Jun 16 19:02:21 UTC 2021
Date: Wednesday, June 16, 2021 @ 19:02:21
Author: anthraxx
Revision: 964314
archrelease: copy trunk to community-x86_64
Added:
gtest/repos/community-x86_64/PKGBUILD
(from rev 964313, gtest/trunk/PKGBUILD)
gtest/repos/community-x86_64/gtest-version.patch
(from rev 964313, gtest/trunk/gtest-version.patch)
Deleted:
gtest/repos/community-x86_64/PKGBUILD
gtest/repos/community-x86_64/gtest-1.10.0-libversion.patch
-------------------------------+
PKGBUILD | 157 +++++++++++++++++++---------------------
gtest-1.10.0-libversion.patch | 27 ------
gtest-version.patch | 22 +++++
3 files changed, 99 insertions(+), 107 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-06-16 19:02:17 UTC (rev 964313)
+++ PKGBUILD 2021-06-16 19:02:21 UTC (rev 964314)
@@ -1,80 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Alexandre Bique <bique.alexandre at gmail.com>
-# Contributor: Louis R. Marascio <lrm at fitnr.com>
-# Contributor: Cody Maloney <cmaloney at theoreticalchaos.com>
-# Contributor: acxz <akashpatel2008 at yahoo dot com>
-
-pkgname=gtest
-pkgver=1.10.0
-pkgrel=6
-pkgdesc='Google Test - C++ testing utility'
-url='https://github.com/google/googletest'
-arch=('x86_64')
-license=('BSD')
-depends=('gcc-libs' 'sh')
-makedepends=('python' 'cmake' 'gcc-libs' 'sh')
-optdepends=('python: gmock generator')
-conflicts=('gmock')
-replaces=('gmock')
-provides=('gmock')
-_srcname=googletest-release-${pkgver}
-source=(${_srcname}.tar.gz::https://github.com/google/googletest/archive/release-${pkgver}.tar.gz
- gtest-1.10.0-libversion.patch)
-sha512sums=('bd52abe938c3722adc2347afad52ea3a17ecc76730d8d16b065e165bc7477d762bce0997a427131866a89f1001e3f3315198204ffa5d643a9355f1f4d0d7b1a9'
- '57d18cdd2d7b744c4e759a51899372befc78624de00fccc71464293f8c36d32f7dd3bb87ec55fc0303031a397bbba5d45075662687cf5bba378f5001dabf2faa')
-
-prepare() {
- cd ${_srcname}
- cp ../gtest-1.10.0-libversion.patch gtest-1.10.0-libversion.patch
- sed "s|__GOOGLETEST_VERSION__|${pkgver}|g" -i gtest-1.10.0-libversion.patch
- # https://src.fedoraproject.org/rpms/gtest/tree/master
- patch -Np1 -i gtest-1.10.0-libversion.patch
-
- # fixup version as they are never correct
- sed -E "s|(GOOGLETEST_VERSION) [0-9\\.]+|\\1 ${pkgver}|" -i CMakeLists.txt
-}
-
-build() {
- cmake -H${_srcname} -Bbuild \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DBUILD_SHARED_LIBS=ON \
- -Dgtest_build_tests=ON
- cmake --build build
-}
-
-check() {
- cmake --build build --target test
-}
-
-package() {
- DESTDIR="${pkgdir}" cmake --build build --target install
-
- # Shouldn't be present
- find "${pkgdir}" -name '*.pump' -printf 'Removing %P\n' -delete
-
- cd ${_srcname}/googletest
- install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
- install -Dm 644 README.md CONTRIBUTORS -t "${pkgdir}/usr/share/doc/${pkgname}"
- install -Dm 755 scripts/gtest-config.in -t "${pkgdir}/usr/bin"
- install -Dm 644 cmake/* -t "${pkgdir}/usr/src/googletest/cmake"
- install -Dm 644 src/* -t "${pkgdir}/usr/src/googletest/src"
- install -Dm 644 CMakeLists.txt -t "${pkgdir}/usr/src/googletest"
-
- cd ../googlemock
- install -Dm 755 scripts/gmock-config.in -t "${pkgdir}/usr/bin"
- install -Dm 644 cmake/* -t "${pkgdir}/usr/src/gmock/cmake"
- install -Dm 644 src/* -t "${pkgdir}/usr/src/gmock/src"
- install -Dm 644 CMakeLists.txt -t "${pkgdir}/usr/src/gmock"
- install -Dm 644 scripts/generator/{*.py,LICENSE,README*} -t "${pkgdir}/usr/share/gmock/generator"
- install -Dm 644 scripts/generator/cpp/* -t "${pkgdir}/usr/share/gmock/generator/cpp"
-
- sed -i 's|src/||' "${pkgdir}/usr/src/gmock/src/gmock-all.cc"
-
- python -m compileall -d /usr/share/gmock "${pkgdir}/usr/share/gmock"
- python -O -m compileall -d /usr/share/gmock "${pkgdir}/usr/share/gmock"
-}
-
-# vim: ts=2 sw=2 et:
Copied: gtest/repos/community-x86_64/PKGBUILD (from rev 964313, gtest/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-06-16 19:02:21 UTC (rev 964314)
@@ -0,0 +1,77 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Alexandre Bique <bique.alexandre at gmail.com>
+# Contributor: Louis R. Marascio <lrm at fitnr.com>
+# Contributor: Cody Maloney <cmaloney at theoreticalchaos.com>
+# Contributor: acxz <akashpatel2008 at yahoo dot com>
+
+pkgname=gtest
+pkgver=1.11.0
+pkgrel=1
+pkgdesc='Google Test - C++ testing utility'
+url='https://github.com/google/googletest'
+arch=('x86_64')
+license=('BSD')
+depends=('gcc-libs' 'sh')
+makedepends=('python' 'cmake' 'gcc-libs' 'sh')
+optdepends=('python: gmock generator')
+conflicts=('gmock')
+replaces=('gmock')
+provides=('gmock')
+_srcname=googletest-release-${pkgver}
+source=(${_srcname}.tar.gz::https://github.com/google/googletest/archive/release-${pkgver}.tar.gz
+ gtest-version.patch)
+sha512sums=('6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28'
+ 'e3e6476d938f65e74a0aa5bbfe58136db937205c8a0536399f46d0096ee728566247b85c82e0067300e465fcbc455a9e0d99611410dece70180aa92170357fbf')
+
+prepare() {
+ cd ${_srcname}
+ cp ../gtest-version.patch gtest-version.patch
+ sed "s|__GOOGLETEST_VERSION__|${pkgver}|g" -i gtest-version.patch
+ patch -Np1 -i gtest-version.patch
+}
+
+build() {
+ cmake -H${_srcname} -Bbuild \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=ON \
+ -Dgtest_build_tests=ON
+ cmake --build build
+}
+
+check() {
+ cmake --build build --target test
+}
+
+package() {
+ DESTDIR="${pkgdir}" cmake --build build --target install
+
+ # Shouldn't be present
+ find "${pkgdir}" -name '*.pump' -printf 'Removing %P\n' -delete
+
+ cd ${_srcname}
+ install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -Dm 644 README.md CONTRIBUTORS -t "${pkgdir}/usr/share/doc/${pkgname}"
+
+ cd googletest
+ install -Dm 755 scripts/gtest-config.in -t "${pkgdir}/usr/bin"
+ install -Dm 644 cmake/* -t "${pkgdir}/usr/src/googletest/cmake"
+ install -Dm 644 src/* -t "${pkgdir}/usr/src/googletest/src"
+ install -Dm 644 CMakeLists.txt -t "${pkgdir}/usr/src/googletest"
+
+ cd ../googlemock
+ install -Dm 644 cmake/* -t "${pkgdir}/usr/src/gmock/cmake"
+ install -Dm 644 src/* -t "${pkgdir}/usr/src/gmock/src"
+ install -Dm 644 CMakeLists.txt -t "${pkgdir}/usr/src/gmock"
+ install -Dm 644 scripts/generator/{*.py,LICENSE,README*} -t "${pkgdir}/usr/share/gmock/generator"
+ install -Dm 644 scripts/generator/cpp/* -t "${pkgdir}/usr/share/gmock/generator/cpp"
+
+ sed -i 's|src/||' "${pkgdir}/usr/src/gmock/src/gmock-all.cc"
+
+ python -m compileall -d /usr/share/gmock "${pkgdir}/usr/share/gmock"
+ python -O -m compileall -d /usr/share/gmock "${pkgdir}/usr/share/gmock"
+}
+
+# vim: ts=2 sw=2 et:
Deleted: gtest-1.10.0-libversion.patch
===================================================================
--- gtest-1.10.0-libversion.patch 2021-06-16 19:02:17 UTC (rev 964313)
+++ gtest-1.10.0-libversion.patch 2021-06-16 19:02:21 UTC (rev 964314)
@@ -1,27 +0,0 @@
-diff -ur a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
---- a/googlemock/CMakeLists.txt 2020-02-24 22:42:28.960922857 -0500
-+++ b/googlemock/CMakeLists.txt 2020-02-24 22:44:55.168453771 -0500
-@@ -100,8 +100,10 @@
- else()
- cxx_library(gmock "${cxx_strict}" src/gmock-all.cc)
- target_link_libraries(gmock PUBLIC gtest)
-+ set_target_properties(gmock PROPERTIES VERSION __GOOGLETEST_VERSION__)
- cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc)
- target_link_libraries(gmock_main PUBLIC gmock)
-+ set_target_properties(gmock_main PROPERTIES VERSION __GOOGLETEST_VERSION__)
- endif()
- # If the CMake version supports it, attach header directory information
- # to the targets for when we are part of a parent build (ie being pulled
-diff -ur a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
---- a/googletest/CMakeLists.txt 2020-02-24 22:42:28.967589562 -0500
-+++ b/googletest/CMakeLists.txt 2020-02-24 22:45:20.125271052 -0500
-@@ -126,7 +126,9 @@
- # are used for other targets, to ensure that gtest can be compiled by a user
- # aggressive about warnings.
- cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
-+set_target_properties(gtest PROPERTIES VERSION __GOOGLETEST_VERSION__)
- cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
-+set_target_properties(gtest_main PROPERTIES VERSION __GOOGLETEST_VERSION__)
- # If the CMake version supports it, attach header directory information
- # to the targets for when we are part of a parent build (ie being pulled
- # in via add_subdirectory() rather than being a standalone build).
Copied: gtest/repos/community-x86_64/gtest-version.patch (from rev 964313, gtest/trunk/gtest-version.patch)
===================================================================
--- gtest-version.patch (rev 0)
+++ gtest-version.patch 2021-06-16 19:02:21 UTC (rev 964314)
@@ -0,0 +1,22 @@
+diff --unified --recursive --text googletest-release-1.11.0.orig/googlemock/CMakeLists.txt googletest-release-1.11.0/googlemock/CMakeLists.txt
+--- googletest-release-1.11.0.orig/googlemock/CMakeLists.txt 2020-11-13 14:33:36.022632459 -0500
++++ googletest-release-1.11.0/googlemock/CMakeLists.txt 2020-11-13 14:35:01.806861990 -0500
+@@ -40,6 +40,7 @@
+ project(gmock CXX C)
+ else()
+ cmake_policy(SET CMP0048 NEW)
++ set(GOOGLETEST_VERSION __GOOGLETEST_VERSION__)
+ project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
+ endif()
+ cmake_minimum_required(VERSION 2.6.4)
+diff --unified --recursive --text googletest-release-1.11.0.orig/googletest/CMakeLists.txt googletest-release-1.11.0/googletest/CMakeLists.txt
+--- googletest-release-1.11.0.orig/googletest/CMakeLists.txt 2020-11-13 14:33:36.039299268 -0500
++++ googletest-release-1.11.0/googletest/CMakeLists.txt 2020-11-13 14:37:10.274915300 -0500
+@@ -46,6 +46,7 @@
+
+ # Project version:
+
++set(GOOGLETEST_VERSION __GOOGLETEST_VERSION__)
+ if (CMAKE_VERSION VERSION_LESS 3.0)
+ project(gtest CXX C)
+ set(PROJECT_VERSION ${GOOGLETEST_VERSION})
More information about the arch-commits
mailing list