mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-01-23 17:43:12 +08:00
[skip-ci] libmemecached: fixed build with patches from Arch
This commit is contained in:
parent
d39783dc1f
commit
dffe5acb82
@ -1,24 +1,40 @@
|
||||
pkgname=libmemcached
|
||||
pkgver=1.0.18
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
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')
|
||||
source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz)
|
||||
sha512sums=('2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585')
|
||||
makedepends=('perl' 'memcached' 'python3-sphinx')
|
||||
source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz
|
||||
libmemcached-fix-linking-with-libpthread.patch
|
||||
libmemcached-build.patch)
|
||||
sha512sums=('2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585'
|
||||
'dd021ab05e51d7b115ddb876ed0ffe01f954ad60146d91048dc20ea3b96f92cb34f60699ccd82768ce4bf87680035f24676d18fb103d3416049cb80a56098fbc'
|
||||
'b3e8e0e5a4fcfcf583001f1923bffb36cb8de90a77f710c2ba3929d6f6364cce5d4ee9edc3f0187055faa035b7233c35797c7cf8dce840cd6a952e0044c39223')
|
||||
|
||||
prepare() {
|
||||
cd $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"
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$srcdir/$pkgname-$pkgver"
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
make DESTDIR="$pkgdir" install
|
||||
make DESTDIR=$pkgdir install
|
||||
}
|
||||
|
21
libmemcached/libmemcached-build.patch
Normal file
21
libmemcached/libmemcached-build.patch
Normal file
@ -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);
|
19
libmemcached/libmemcached-fix-linking-with-libpthread.patch
Normal file
19
libmemcached/libmemcached-fix-linking-with-libpthread.patch
Normal file
@ -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
|
||||
;;
|
||||
|
Loading…
Reference in New Issue
Block a user