[arch-commits] Commit in snappy/trunk (4 files)

[Anatol Pomozov]

    Date: Tuesday, September 7, 2021 @ 23:43:29
  Author: anatolik
Revision: 423515

FS#71246 generate snappy.pc at buildtime

Added:
  snappy/trunk/cmake_add_pkgconfig.patch
  snappy/trunk/snappy.pc.in
Modified:
  snappy/trunk/PKGBUILD
Deleted:
  snappy/trunk/snappy.pc

---------------------------+
 PKGBUILD                  |   12 ++++++------
 cmake_add_pkgconfig.patch |   24 ++++++++++++++++++++++++
 snappy.pc                 |   10 ----------
 snappy.pc.in              |   10 ++++++++++
 4 files changed, 40 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-07 20:03:12 UTC (rev 423514)
+++ PKGBUILD	2021-09-07 23:43:29 UTC (rev 423515)
@@ -12,16 +12,20 @@
 checkdepends=('zlib')
 makedepends=('cmake' 'clang' 'gtest' 'benchmark')
 source=("https://github.com/google/snappy/archive/$pkgver/$pkgname-$pkgver.tar.gz"
-        snappy.pc
+        snappy.pc.in
+        cmake_add_pkgconfig.patch
         system_gtest.patch::https://github.com/google/snappy/commit/114df35e84ad95b6d5afbcf69aa85a14ff029000.patch
         fix_inline.patch::https://github.com/google/snappy/pull/128/commits/0c716d435abe65250100c2caea0e5126ac4e14bd.patch)
 sha256sums=('75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7'
-            'd210ff4d3ffe9a987b974a8387d967af66a93bf90d72fedce94a2159d937813e'
+            '134f06ca0584a1026538d0fb972fc141c008390ecae1806184b721eca1abbc75'
+            '2a204d7d35509ffc290d80c641fcb7e8488c67ca550aa1695493cff12c53156b'
             'ca96fd9e72f35ea63af82f19ff1ca93441bf5ea6b3f53ef4b974e83c249d8e3e'
             'ad79190b274df5ddabf14eddd2bb0d9a091ee7d44e4afde89febf9a8f783fdce')
 
 prepare() {
   cd "$pkgname-$pkgver"
+  cp ../snappy.pc.in .
+  patch -p1 < ../cmake_add_pkgconfig.patch # https://bugs.archlinux.org/task/71246
   patch -p1 < ../system_gtest.patch # https://github.com/google/snappy/pull/132
   patch -p1 < ../fix_inline.patch # https://github.com/google/snappy/pull/128
 }
@@ -57,10 +61,6 @@
 
   make DESTDIR="$pkgdir" install
   install -m644 -D COPYING "$pkgdir/usr/share/licenses/snappy/LICENSE"
-
-  # upstream dropped the pkgconfig file and isn't interested in adding it back.
-  # https://github.com/google/snappy/pull/55
-  install -Dm644 "$srcdir/snappy.pc" "$pkgdir/usr/lib/pkgconfig/snappy.pc"
 }
 
 # vim:set ts=2 sw=2 et:

Added: cmake_add_pkgconfig.patch
===================================================================
--- cmake_add_pkgconfig.patch	                        (rev 0)
+++ cmake_add_pkgconfig.patch	2021-09-07 23:43:29 UTC (rev 423515)
@@ -0,0 +1,24 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -187,6 +187,12 @@
+   "${PROJECT_BINARY_DIR}/config.h"
+ )
+ 
++configure_file(
++  "${CMAKE_CURRENT_SOURCE_DIR}/snappy.pc.in"
++  "${CMAKE_CURRENT_BINARY_DIR}/snappy.pc"
++  @ONLY
++)
++
+ # We don't want to define HAVE_ macros in public headers. Instead, we use
+ # CMake's variable substitution with 0/1 variables, which will be seen by the
+ # preprocessor as constants.
+@@ -395,4 +401,8 @@
+       "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake"
+     DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
+   )
++  install(
++    FILES "${PROJECT_BINARY_DIR}/snappy.pc"
++    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
++  )
+ endif(SNAPPY_INSTALL)

Deleted: snappy.pc
===================================================================
--- snappy.pc	2021-09-07 20:03:12 UTC (rev 423514)
+++ snappy.pc	2021-09-07 23:43:29 UTC (rev 423515)
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: snappy
-Description: A fast compression/decompression library
-Version: 1.1.4
-Libs: -L${libdir} -lsnappy
-Cflags: -I${includedir}

Added: snappy.pc.in
===================================================================
--- snappy.pc.in	                        (rev 0)
+++ snappy.pc.in	2021-09-07 23:43:29 UTC (rev 423515)
@@ -0,0 +1,10 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: snappy
+Description: Fast compressor/decompressor library.
+Version: @PROJECT_VERSION@
+Libs: -L${libdir} -lsnappy
+Cflags: -I${includedir}