[arch-commits] Commit in libmemcached/trunk (PKGBUILD libmemcached-build.patch)

[Evangelos Foutras]

    Date: Monday, June 4, 2018 @ 04:02:53
  Author: foutrelis
Revision: 340216

upgpkg: libmemcached 1.0.18-3

.BUILDINFO rebuild

Added:
  libmemcached/trunk/libmemcached-build.patch
Modified:
  libmemcached/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   14 ++++++++------
 libmemcached-build.patch |   21 +++++++++++++++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-04 03:51:23 UTC (rev 340215)
+++ PKGBUILD	2018-06-04 04:02:53 UTC (rev 340216)
@@ -3,7 +3,7 @@
 
 pkgname=libmemcached
 pkgver=1.0.18
-pkgrel=2
+pkgrel=3
 pkgdesc="C and C++ client library to the memcached server"
 arch=('x86_64')
 url="http://libmemcached.org/"
@@ -11,9 +11,11 @@
 depends=('glibc' 'libsasl' 'libevent')
 makedepends=('perl' 'memcached' 'python-sphinx')
 source=(https://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz
-        libmemcached-fix-linking-with-libpthread.patch)
+        libmemcached-fix-linking-with-libpthread.patch
+        libmemcached-build.patch)
 sha256sums=('e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82'
-            '02cd903ed217ef6d023bccefecb8d599ffab9b800a4f1a4e0124f4d71888d0dc')
+            '02cd903ed217ef6d023bccefecb8d599ffab9b800a4f1a4e0124f4d71888d0dc'
+            'bd62d0080d4ce39981a2e150af54fe80ebe720ba4cfaf5a856c3b9d8a73ecf7d')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -22,11 +24,13 @@
   # https://bugzilla.redhat.com/show_bug.cgi?id=1037707
   # https://bugs.launchpad.net/libmemcached/+bug/1281907
   patch -Np1 -i ../libmemcached-fix-linking-with-libpthread.patch
+
+  # https://bugs.launchpad.net/libmemcached/+bug/1663985
+  patch -Np1 -i ../libmemcached-build.patch
 }
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
   ./configure --prefix=/usr
   make
 }
@@ -33,13 +37,11 @@
 
 check() {
   cd "$srcdir/$pkgname-$pkgver"
-
   #make -k check
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-
   make DESTDIR="$pkgdir" install
 }
 

Added: libmemcached-build.patch
===================================================================
--- libmemcached-build.patch	                        (rev 0)
+++ libmemcached-build.patch	2018-06-04 04:02:53 UTC (rev 340216)
@@ -0,0 +1,21 @@
+diff -up ./clients/memflush.cc.old ./clients/memflush.cc
+--- ./clients/memflush.cc.old	2017-02-12 10:12:59.615209225 +0100
++++ ./clients/memflush.cc	2017-02-12 10:13:39.998382783 +0100
+@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
+ {
+   options_parse(argc, argv);
+ 
+-  if (opt_servers == false)
++  if (!opt_servers)
+   {
+     char *temp;
+ 
+@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
+       opt_servers= strdup(temp);
+     }
+ 
+-    if (opt_servers == false)
++    if (!opt_servers)
+     {
+       std::cerr << "No Servers provided" << std::endl;
+       exit(EXIT_FAILURE);