Przeglądaj źródła

Fix install libmemcached with GCC 7

lj2007331@gmail.com 6 lat temu
rodzic
commit
023378c8cf
2 zmienionych plików z 22 dodań i 0 usunięć
  1. 1 0
      include/memcached.sh
  2. 21 0
      src/libmemcached-build.patch

+ 1 - 0
include/memcached.sh

@@ -78,6 +78,7 @@ Install_php-memcached() {
     # php memcached extension
     tar xzf libmemcached-${libmemcached_ver}.tar.gz
     pushd libmemcached-${libmemcached_ver}
+    patch -d libmemcached-${libmemcached_ver} -p0 < libmemcached-build.patch
     [ "${OS}" == "CentOS" ] && yum -y install cyrus-sasl-devel
     [[ "${OS}" =~ ^Ubuntu$|^Debian$ ]] && sed -i "s@lthread -pthread -pthreads@lthread -lpthread -pthreads@" ./configure
     ./configure --with-memcached=${memcached_install_dir}

+ 21 - 0
src/libmemcached-build.patch

@@ -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);