Merge branch '4.2'

nicolas-grekas · nicolas-grekas · commit 2cad97b0b517 · 2019-02-01T16:47:50.000+01:00
* 4.2:
  Use system wide memcached.so
diff --git a/.travis.yml b/.travis.yml
@@ -143,6 +143,7 @@ before_install:
           echo opcache.enable_cli = 1 >> $INI
           echo apc.enable_cli = 1 >> $INI
           echo extension = redis.so >> $INI
+          echo extension = memcached.so >> $INI
       done
 
     - |
@@ -162,31 +163,6 @@ before_install:
           tfold ext.igbinary tpecl igbinary-2.0.8 igbinary.so $INI
           tfold ext.zookeeper tpecl zookeeper-0.6.0 zookeeper.so $INI
 
-          if [[ $PHP == 7.3 ]]; then
-              # System libmemcached is missing sasl
-              LIBMEMCACHED_VERSION=1.0.18
-              wget "https://launchpad.net/libmemcached/1.0/${LIBMEMCACHED_VERSION}/+download/libmemcached-${LIBMEMCACHED_VERSION}.tar.gz" -O libmemcached-${LIBMEMCACHED_VERSION}.tar.gz
-              tar xvfz libmemcached-${LIBMEMCACHED_VERSION}.tar.gz
-              cd "libmemcached-${LIBMEMCACHED_VERSION}"
-              mkdir -p /opt/libmemcached/${LIBMEMCACHED_VERSION}
-              ./configure --prefix="/opt/libmemcached/${LIBMEMCACHED_VERSION}" LDFLAGS="-lpthread"
-              make
-              make install
-              cd -
-
-              EXTMEMCACHED_VERSION=3.1.3
-              wget https://pecl.php.net/get/memcached-${EXTMEMCACHED_VERSION}.tgz
-              tar xzvf memcached-${EXTMEMCACHED_VERSION}.tgz
-              cd memcached-${EXTMEMCACHED_VERSION}
-              phpize
-              ./configure --with-libmemcached-dir=/opt/libmemcached/${LIBMEMCACHED_VERSION}
-              make
-              sudo make install
-              cd -
-          fi
-
-          echo extension = memcached.so >> $INI
-
            if [[ $PHP != 7.3 ]]; then
               wget http://ftp.debian.org/debian/pool/main/libr/librabbitmq/librabbitmq-dev_0.5.2-2_amd64.deb
               wget http://ftp.debian.org/debian/pool/main/libr/librabbitmq/librabbitmq1_0.5.2-2_amd64.deb
