Date: Monday, June 4, 2018 @ 04:02:59
Author: foutrelis
Revision: 340217
archrelease: copy trunk to community-x86_64
Added:
libmemcached/repos/community-x86_64/PKGBUILD
(from rev 340216, libmemcached/trunk/PKGBUILD)
libmemcached/repos/community-x86_64/libmemcached-build.patch
(from rev 340216, libmemcached/trunk/libmemcached-build.patch)
libmemcached/repos/community-x86_64/libmemcached-fix-linking-with-libpthread.patch
(from rev 340216,
libmemcached/trunk/libmemcached-fix-linking-with-libpthread.patch)
Deleted:
libmemcached/repos/community-x86_64/PKGBUILD
libmemcached/repos/community-x86_64/libmemcached-fix-linking-with-libpthread.patch
------------------------------------------------+
PKGBUILD | 94 +++++++++++------------
libmemcached-build.patch | 21 +++++
libmemcached-fix-linking-with-libpthread.patch | 38 ++++-----
3 files changed, 88 insertions(+), 65 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-04 04:02:53 UTC (rev 340216)
+++ PKGBUILD 2018-06-04 04:02:59 UTC (rev 340217)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <[email protected]>
-
-pkgname=libmemcached
-pkgver=1.0.18
-pkgrel=2
-pkgdesc="C and C++ client library to the memcached server"
-arch=('i686' 'x86_64')
-url="http://libmemcached.org/";
-license=('GPL')
-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)
-sha256sums=('e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82'
- '02cd903ed217ef6d023bccefecb8d599ffab9b800a4f1a4e0124f4d71888d0dc')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # Fix linking against libpthread (patch from Fedora)
- # 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
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr
- make
-}
-
-check() {
- cd "$srcdir/$pkgname-$pkgver"
-
- #make -k check
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: libmemcached/repos/community-x86_64/PKGBUILD (from rev 340216,
libmemcached/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-06-04 04:02:59 UTC (rev 340217)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Evangelos Foutras <[email protected]>
+
+pkgname=libmemcached
+pkgver=1.0.18
+pkgrel=3
+pkgdesc="C and C++ client library to the memcached server"
+arch=('x86_64')
+url="http://libmemcached.org/";
+license=('GPL')
+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-build.patch)
+sha256sums=('e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82'
+ '02cd903ed217ef6d023bccefecb8d599ffab9b800a4f1a4e0124f4d71888d0dc'
+ 'bd62d0080d4ce39981a2e150af54fe80ebe720ba4cfaf5a856c3b9d8a73ecf7d')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Fix linking against libpthread (patch from Fedora)
+ # 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
+}
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+ #make -k check
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: libmemcached/repos/community-x86_64/libmemcached-build.patch (from rev
340216, libmemcached/trunk/libmemcached-build.patch)
===================================================================
--- libmemcached-build.patch (rev 0)
+++ libmemcached-build.patch 2018-06-04 04:02:59 UTC (rev 340217)
@@ -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);
Deleted: libmemcached-fix-linking-with-libpthread.patch
===================================================================
--- libmemcached-fix-linking-with-libpthread.patch 2018-06-04 04:02:53 UTC
(rev 340216)
+++ libmemcached-fix-linking-with-libpthread.patch 2018-06-04 04:02:59 UTC
(rev 340217)
@@ -1,19 +0,0 @@
-diff -up libmemcached-1.0.16/build-aux/ltmain.sh.orig
libmemcached-1.0.16/build-aux/ltmain.sh
---- libmemcached-1.0.16/build-aux/ltmain.sh.orig 2013-12-03
16:36:53.222107642 +0100
-+++ libmemcached-1.0.16/build-aux/ltmain.sh 2013-12-03 16:37:35.770132249
+0100
-@@ -5664,6 +5664,15 @@ func_mode_link ()
- *" $arg "*) ;;
- * ) func_append new_inherited_linker_flags " $arg" ;;
- esac
-+ # As we are forced to pass -nostdlib to g++ during linking, the option
-+ # -pthread{,s} is not in effect; add the -lpthread to $deplist
-+ # explicitly to link correctly.
-+ if test "$tagname" = CXX -a x"$with_gcc" = xyes; then
-+ case "$arg" in
-+ -pthread*) func_append deplibs " -lpthread" ;;
-+ esac
-+ fi
-+
- continue
- ;;
-
Copied:
libmemcached/repos/community-x86_64/libmemcached-fix-linking-with-libpthread.patch
(from rev 340216,
libmemcached/trunk/libmemcached-fix-linking-with-libpthread.patch)
===================================================================
--- libmemcached-fix-linking-with-libpthread.patch
(rev 0)
+++ libmemcached-fix-linking-with-libpthread.patch 2018-06-04 04:02:59 UTC
(rev 340217)
@@ -0,0 +1,19 @@
+diff -up libmemcached-1.0.16/build-aux/ltmain.sh.orig
libmemcached-1.0.16/build-aux/ltmain.sh
+--- libmemcached-1.0.16/build-aux/ltmain.sh.orig 2013-12-03
16:36:53.222107642 +0100
++++ libmemcached-1.0.16/build-aux/ltmain.sh 2013-12-03 16:37:35.770132249
+0100
+@@ -5664,6 +5664,15 @@ func_mode_link ()
+ *" $arg "*) ;;
+ * ) func_append new_inherited_linker_flags " $arg" ;;
+ esac
++ # As we are forced to pass -nostdlib to g++ during linking, the option
++ # -pthread{,s} is not in effect; add the -lpthread to $deplist
++ # explicitly to link correctly.
++ if test "$tagname" = CXX -a x"$with_gcc" = xyes; then
++ case "$arg" in
++ -pthread*) func_append deplibs " -lpthread" ;;
++ esac
++ fi
++
+ continue
+ ;;
+
