[arch-commits] Commit in gtest/repos (8 files)
Levente Polyak
anthraxx at archlinux.org
Sun Aug 7 23:44:15 UTC 2016
Date: Sunday, August 7, 2016 @ 23:44:15
Author: anthraxx
Revision: 185973
archrelease: copy trunk to community-i686, community-x86_64
Added:
gtest/repos/community-i686/PKGBUILD
(from rev 185972, gtest/trunk/PKGBUILD)
gtest/repos/community-i686/gtest.pc.in
(from rev 185972, gtest/trunk/gtest.pc.in)
gtest/repos/community-i686/pkgconfig.patch
(from rev 185972, gtest/trunk/pkgconfig.patch)
gtest/repos/community-x86_64/PKGBUILD
(from rev 185972, gtest/trunk/PKGBUILD)
gtest/repos/community-x86_64/gtest.pc.in
(from rev 185972, gtest/trunk/gtest.pc.in)
gtest/repos/community-x86_64/pkgconfig.patch
(from rev 185972, gtest/trunk/pkgconfig.patch)
Deleted:
gtest/repos/community-i686/PKGBUILD
gtest/repos/community-x86_64/PKGBUILD
----------------------------------+
/PKGBUILD | 122 +++++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 55 ----------------
community-i686/gtest.pc.in | 9 ++
community-i686/pkgconfig.patch | 27 ++++++++
community-x86_64/PKGBUILD | 55 ----------------
community-x86_64/gtest.pc.in | 9 ++
community-x86_64/pkgconfig.patch | 27 ++++++++
7 files changed, 194 insertions(+), 110 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-08-07 23:40:25 UTC (rev 185972)
+++ community-i686/PKGBUILD 2016-08-07 23:44:15 UTC (rev 185973)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars 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>
-
-pkgname=gtest
-pkgver=1.7.0
-pkgrel=4
-pkgdesc="Google Test - C++ testing utility based on the xUnit framework (like JUnit)"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/googletest/"
-license=('custom:BSD3')
-depends=('gcc-libs' 'sh')
-makedepends=('python2' 'cmake')
-source=(http://googletest.googlecode.com/files/$pkgname-$pkgver.zip
- pkgconfig.patch)
-sha512sums=('8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07'
- 'e39e62960566408f4c011e630b7c4dc8f9de5da3f7b5ac01ef0214712eff9c9283d6f6b19b375c806d7ed3f056258b3096c51855134766d609989d40f80f3bc7')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -p1 < "${srcdir}/pkgconfig.patch"
- sed -r "s|(Version:) .+|\1 ${pkgver}|" -i gtest.pc.in
- mkdir build
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # this is odd but needed only to generate gtest-config.
- ./configure --prefix=/usr
-
- cd build
- cmake -DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_SHARED_LIBS=ON \
- -DCMAKE_SKIP_RPATH=ON ..
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make -C build DESTDIR="${pkgdir}" install
- install -Dm 755 scripts/gtest-config -t "$pkgdir"/usr/bin
- install -Dm 644 m4/gtest.m4 -t "$pkgdir"/usr/share/aclocal
- install -Dm 644 build/libgtest{,_main}.so -t "$pkgdir"/usr/lib
- install -Dm 644 include/gtest/*.h -t "$pkgdir"/usr/include/gtest
- install -Dm 644 include/gtest/internal/*.h -t "$pkgdir"/usr/include/gtest/internal
- install -Dm 644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
- install -Dm 644 fused-src/gtest/* -t "$pkgdir"/usr/src/gtest/src
- install -Dm 644 CMakeLists.txt -t "$pkgdir"/usr/src/gtest
- install -Dm 644 cmake/* -t "$pkgdir"/usr/src/gtest/cmake
-}
-
-# vim:set ts=2 sw=2 et:
Copied: gtest/repos/community-i686/PKGBUILD (from rev 185972, gtest/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-08-07 23:44:15 UTC (rev 185973)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars 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>
+
+pkgname=gtest
+pkgver=1.7.0
+pkgrel=5
+pkgdesc="Google Test - C++ testing utility based on the xUnit framework (like JUnit)"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/googletest/"
+license=('custom:BSD3')
+depends=('gcc-libs' 'sh')
+makedepends=('python2' 'cmake')
+source=(http://googletest.googlecode.com/files/$pkgname-$pkgver.zip
+ pkgconfig.patch
+ gtest.pc.in)
+sha512sums=('8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07'
+ '7e9ad4cd470eaab7ed5fb1cce1d5721d40fc03a62b0c895b8f9657679ffa43f91b99800bb1e02a6c5c2d0a72e94bb8ea008aa6e74fdb1460b1326a84da5e9f91'
+ '4760a6e039eaeb6c3b917cfac173e4738a5d4675b89b84ad91b0260b7f4386ce3561529c0b7d1f8c3792beb3c8535470372b196585ec4468739a17fa314637e0')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+ cp "${srcdir}/gtest.pc.in" .
+ sed -r "s|(Version:) .+|\1 ${pkgver}|" -i gtest.pc.in
+ patch -p1 < "${srcdir}/pkgconfig.patch"
+ mkdir build
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # this is odd but needed only to generate gtest-config.
+ ./configure --prefix=/usr
+
+ cd build
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_SHARED_LIBS=ON \
+ -DCMAKE_SKIP_RPATH=ON ..
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make -C build DESTDIR="${pkgdir}" install
+ install -Dm 755 scripts/gtest-config -t "$pkgdir"/usr/bin
+ install -Dm 644 m4/gtest.m4 -t "$pkgdir"/usr/share/aclocal
+ install -Dm 644 build/libgtest{,_main}.so -t "$pkgdir"/usr/lib
+ install -Dm 644 include/gtest/*.h -t "$pkgdir"/usr/include/gtest
+ install -Dm 644 include/gtest/internal/*.h -t "$pkgdir"/usr/include/gtest/internal
+ install -Dm 644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
+ install -Dm 644 fused-src/gtest/* -t "$pkgdir"/usr/src/gtest/src
+ install -Dm 644 cmake/* -t "$pkgdir"/usr/src/gtest/cmake
+
+ # undo pkg-config patch so subprojects including this don't try to generate it
+ patch -Rp1 < "${srcdir}/pkgconfig.patch"
+ install -Dm 644 CMakeLists.txt -t "$pkgdir"/usr/src/gtest
+}
+
+# vim:set ts=2 sw=2 et:
Copied: gtest/repos/community-i686/gtest.pc.in (from rev 185972, gtest/trunk/gtest.pc.in)
===================================================================
--- community-i686/gtest.pc.in (rev 0)
+++ community-i686/gtest.pc.in 2016-08-07 23:44:15 UTC (rev 185973)
@@ -0,0 +1,9 @@
+Name: libgtest
+Description: Google's framework for writing C++ tests on a variety of platforms
+Version: 0.0.0
+
+prefix=@CMAKE_INSTALL_PREFIX@
+includedir=${prefix}/include
+libdir=${prefix}/lib
+Cflags:-I${includedir}/gtest
+Libs: -L${libdir} -lgtest -lgtest_main
Copied: gtest/repos/community-i686/pkgconfig.patch (from rev 185972, gtest/trunk/pkgconfig.patch)
===================================================================
--- community-i686/pkgconfig.patch (rev 0)
+++ community-i686/pkgconfig.patch 2016-08-07 23:44:15 UTC (rev 185973)
@@ -0,0 +1,27 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 281c4c2..e4354a8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,6 +29,9 @@
+ pre_project_set_up_hermetic_build()
+ endif()
+
++# pkg-config support
++configure_file("gtest.pc.in" "gtest.pc" @ONLY)
++
+ ########################################################################
+ #
+ # Project-wide settings
+@@ -71,6 +71,10 @@
+ cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
+ target_link_libraries(gtest_main gtest)
+
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gtest.pc"
++ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/"
++)
++
+ ########################################################################
+ #
+ # Samples on how to link user tests with gtest or gtest_main.
+--
+1.9.1
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-08-07 23:40:25 UTC (rev 185972)
+++ community-x86_64/PKGBUILD 2016-08-07 23:44:15 UTC (rev 185973)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars 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>
-
-pkgname=gtest
-pkgver=1.7.0
-pkgrel=4
-pkgdesc="Google Test - C++ testing utility based on the xUnit framework (like JUnit)"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/googletest/"
-license=('custom:BSD3')
-depends=('gcc-libs' 'sh')
-makedepends=('python2' 'cmake')
-source=(http://googletest.googlecode.com/files/$pkgname-$pkgver.zip
- pkgconfig.patch)
-sha512sums=('8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07'
- 'e39e62960566408f4c011e630b7c4dc8f9de5da3f7b5ac01ef0214712eff9c9283d6f6b19b375c806d7ed3f056258b3096c51855134766d609989d40f80f3bc7')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -p1 < "${srcdir}/pkgconfig.patch"
- sed -r "s|(Version:) .+|\1 ${pkgver}|" -i gtest.pc.in
- mkdir build
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # this is odd but needed only to generate gtest-config.
- ./configure --prefix=/usr
-
- cd build
- cmake -DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_SHARED_LIBS=ON \
- -DCMAKE_SKIP_RPATH=ON ..
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make -C build DESTDIR="${pkgdir}" install
- install -Dm 755 scripts/gtest-config -t "$pkgdir"/usr/bin
- install -Dm 644 m4/gtest.m4 -t "$pkgdir"/usr/share/aclocal
- install -Dm 644 build/libgtest{,_main}.so -t "$pkgdir"/usr/lib
- install -Dm 644 include/gtest/*.h -t "$pkgdir"/usr/include/gtest
- install -Dm 644 include/gtest/internal/*.h -t "$pkgdir"/usr/include/gtest/internal
- install -Dm 644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
- install -Dm 644 fused-src/gtest/* -t "$pkgdir"/usr/src/gtest/src
- install -Dm 644 CMakeLists.txt -t "$pkgdir"/usr/src/gtest
- install -Dm 644 cmake/* -t "$pkgdir"/usr/src/gtest/cmake
-}
-
-# vim:set ts=2 sw=2 et:
Copied: gtest/repos/community-x86_64/PKGBUILD (from rev 185972, gtest/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-08-07 23:44:15 UTC (rev 185973)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars 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>
+
+pkgname=gtest
+pkgver=1.7.0
+pkgrel=5
+pkgdesc="Google Test - C++ testing utility based on the xUnit framework (like JUnit)"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/googletest/"
+license=('custom:BSD3')
+depends=('gcc-libs' 'sh')
+makedepends=('python2' 'cmake')
+source=(http://googletest.googlecode.com/files/$pkgname-$pkgver.zip
+ pkgconfig.patch
+ gtest.pc.in)
+sha512sums=('8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07'
+ '7e9ad4cd470eaab7ed5fb1cce1d5721d40fc03a62b0c895b8f9657679ffa43f91b99800bb1e02a6c5c2d0a72e94bb8ea008aa6e74fdb1460b1326a84da5e9f91'
+ '4760a6e039eaeb6c3b917cfac173e4738a5d4675b89b84ad91b0260b7f4386ce3561529c0b7d1f8c3792beb3c8535470372b196585ec4468739a17fa314637e0')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+ cp "${srcdir}/gtest.pc.in" .
+ sed -r "s|(Version:) .+|\1 ${pkgver}|" -i gtest.pc.in
+ patch -p1 < "${srcdir}/pkgconfig.patch"
+ mkdir build
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # this is odd but needed only to generate gtest-config.
+ ./configure --prefix=/usr
+
+ cd build
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_SHARED_LIBS=ON \
+ -DCMAKE_SKIP_RPATH=ON ..
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make -C build DESTDIR="${pkgdir}" install
+ install -Dm 755 scripts/gtest-config -t "$pkgdir"/usr/bin
+ install -Dm 644 m4/gtest.m4 -t "$pkgdir"/usr/share/aclocal
+ install -Dm 644 build/libgtest{,_main}.so -t "$pkgdir"/usr/lib
+ install -Dm 644 include/gtest/*.h -t "$pkgdir"/usr/include/gtest
+ install -Dm 644 include/gtest/internal/*.h -t "$pkgdir"/usr/include/gtest/internal
+ install -Dm 644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
+ install -Dm 644 fused-src/gtest/* -t "$pkgdir"/usr/src/gtest/src
+ install -Dm 644 cmake/* -t "$pkgdir"/usr/src/gtest/cmake
+
+ # undo pkg-config patch so subprojects including this don't try to generate it
+ patch -Rp1 < "${srcdir}/pkgconfig.patch"
+ install -Dm 644 CMakeLists.txt -t "$pkgdir"/usr/src/gtest
+}
+
+# vim:set ts=2 sw=2 et:
Copied: gtest/repos/community-x86_64/gtest.pc.in (from rev 185972, gtest/trunk/gtest.pc.in)
===================================================================
--- community-x86_64/gtest.pc.in (rev 0)
+++ community-x86_64/gtest.pc.in 2016-08-07 23:44:15 UTC (rev 185973)
@@ -0,0 +1,9 @@
+Name: libgtest
+Description: Google's framework for writing C++ tests on a variety of platforms
+Version: 0.0.0
+
+prefix=@CMAKE_INSTALL_PREFIX@
+includedir=${prefix}/include
+libdir=${prefix}/lib
+Cflags:-I${includedir}/gtest
+Libs: -L${libdir} -lgtest -lgtest_main
Copied: gtest/repos/community-x86_64/pkgconfig.patch (from rev 185972, gtest/trunk/pkgconfig.patch)
===================================================================
--- community-x86_64/pkgconfig.patch (rev 0)
+++ community-x86_64/pkgconfig.patch 2016-08-07 23:44:15 UTC (rev 185973)
@@ -0,0 +1,27 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 281c4c2..e4354a8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,6 +29,9 @@
+ pre_project_set_up_hermetic_build()
+ endif()
+
++# pkg-config support
++configure_file("gtest.pc.in" "gtest.pc" @ONLY)
++
+ ########################################################################
+ #
+ # Project-wide settings
+@@ -71,6 +71,10 @@
+ cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
+ target_link_libraries(gtest_main gtest)
+
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gtest.pc"
++ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/"
++)
++
+ ########################################################################
+ #
+ # Samples on how to link user tests with gtest or gtest_main.
+--
+1.9.1
More information about the arch-commits
mailing list