[arch-commits] Commit in gtest/trunk (PKGBUILD pkgconfig.patch)

[Levente Polyak]

    Date: Saturday, August 6, 2016 @ 10:21:02
  Author: anthraxx
Revision: 185590

upgpkg: gtest 1.7.0-3 (add gtest-config and pkgconfig)

Added:
  gtest/trunk/pkgconfig.patch
Modified:
  gtest/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   42 +++++++++++++++++++++++++++---------------
 pkgconfig.patch |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-06 09:45:12 UTC (rev 185589)
+++ PKGBUILD	2016-08-06 10:21:02 UTC (rev 185590)
@@ -6,7 +6,7 @@
 
 pkgname=gtest
 pkgver=1.7.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Google Test - C++ testing utility based on the xUnit framework (like JUnit)"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/googletest/"
@@ -13,30 +13,42 @@
 license=('custom:BSD3')
 depends=('gcc-libs' 'sh')
 makedepends=('python2' 'cmake')
-source=("http://googletest.googlecode.com/files/$pkgname-$pkgver.zip")
+source=(http://googletest.googlecode.com/files/$pkgname-$pkgver.zip
+        pkgconfig.patch)
+sha512sums=('8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07'
+            '86119b8e731d1dfaf5e3e968b6d7955c7171a0d45c52f871fa16108c8bb0dfcb1ee49be7d682ac2e148e789563a5b527ac6c163803e812130a62393fe08e16b8')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 < "${srcdir}/pkgconfig.patch"
+  mkdir build
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  rm -rf build
-  mkdir build
+  # this is odd but needed only to generate gtest-config.
+  ./configure --prefix=/usr
+
   cd build
-
-  cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_SKIP_RPATH=ON ..
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_SHARED_LIBS=ON \
+    -DCMAKE_SKIP_RPATH=ON ..
   make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  mkdir -pm 0755 "$pkgdir"/usr/{lib,include/gtest/internal,share/licenses/$pkgname,src/gtest/src,src/gtest/cmake}
-  install -m 0644 build/libgtest{,_main}.so "$pkgdir"/usr/lib
-  install -m 0644 include/gtest/*.h "$pkgdir"/usr/include/gtest
-  install -m 0644 include/gtest/internal/*.h "$pkgdir"/usr/include/gtest/internal/
-  install -m 0644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/
-  install -m 0644 "$srcdir/$pkgname-$pkgver/fused-src/gtest"/* "$pkgdir"/usr/src/gtest/src/
-  install -m 0644 "$srcdir/$pkgname-$pkgver/CMakeLists.txt" "$pkgdir"/usr/src/gtest/
-  install -m 0644 "$srcdir/$pkgname-$pkgver/cmake"/* "$pkgdir"/usr/src/gtest/cmake/
+  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:
-sha512sums=('8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07')

Added: pkgconfig.patch
===================================================================
--- pkgconfig.patch	                        (rev 0)
+++ pkgconfig.patch	2016-08-06 10:21:02 UTC (rev 185590)
@@ -0,0 +1,54 @@
+From d4b25ce723812faf78d8ee038b7cbed00cbba682 Mon Sep 17 00:00:00 2001
+From: Rodrigo Caimi <caimi at datacom.ind.br>
+Date: Tue, 7 Oct 2014 15:37:10 -0300
+Subject: [PATCH] CMakeLists, gtest.pc.in: Add pkg-config support to gtest
+ 1.7.0
+
+Signed-off-by: Rodrigo Caimi <caimi at datacom.ind.br>
+---
+ CMakeLists.txt | 6 ++++++
+ gtest.pc.in    | 9 +++++++++
+ 2 files changed, 15 insertions(+)
+ create mode 100644 gtest.pc.in
+
+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.
+diff --git a/gtest.pc.in b/gtest.pc.in
+new file mode 100644
+index 0000000..57b1049
+--- /dev/null
++++ b/gtest.pc.in
+@@ -0,0 +1,8 @@
++Name: libgtest
++Description: Google's framework for writing C++ tests on a variety of platforms
++
++prefix=@CMAKE_INSTALL_PREFIX@
++includedir=${prefix}/include
++libdir=${prefix}/lib
++Cflags:-I${includedir}/gtest
++Libs: -L${libdir} -lgtest -lgtest_main
+-- 
+1.9.1