Fix swoole build for PHP 7.3 and PHP 7.4

devilbox · Dec 8, 2018 · 9f280dd · 9f280dd
1 parent 68f1178
commit 9f280dd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 110 deletions.
diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3
@@ -298,37 +298,13 @@ RUN set -x \
 	&& cd /tmp/swoole \
 	&& git checkout master \
 	&& git checkout $(git describe --abbrev=0 --tags) \
-&& git submodule update --init --recursive \
-#`&& cd thirdparty/hiredis` \
-#`&& make -j$(getconf _NPROCESSORS_ONLN)` \
-#`&& make install` \
-#`&& cd ../../` \
-&& cd thirdparty/nghttp2 \
-&& cmake . \
-&& make install \
-&& ldconfig \
-&& cd ../.. \
 && phpize \
 && ./configure \
-  --enable-async-redis \
   --enable-openssl \
-  --enable-thread \
-  --enable-swoole \
-  --enable-swoole-static \
-  --with-swoole \
-  --with-openssl-dir=/usr \
+  --enable-sockets \
+  --enable-http2 \
   --enable-mysqlnd \
-  --enable-coroutine \
-  --enable-picohttpparser \
-  #`--enable-timewheel` \
-  #`--enable-hugepage` \
-  #`--enable-asan` \
-  #`--with-phpx-dir=` \
-  #`--with-jemalloc-dir=/usr/include/jemalloc` \
-  #`--enable-coroutine-postgresql` \
-  #`--enable-http2` \
-  #`--enable-sockets` \
-  #`--with-libpq-dir=/usr/include/postgresql/libpq/` \
+  --enable-coroutine-postgresql \
 && make -j$(getconf _NPROCESSORS_ONLN) \
 && make install \
  \

diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4
@@ -285,37 +285,13 @@ RUN set -x \
 	&& cd /tmp/swoole \
 	&& git checkout master \
 	&& git checkout $(git describe --abbrev=0 --tags) \
-&& git submodule update --init --recursive \
-#`&& cd thirdparty/hiredis` \
-#`&& make -j$(getconf _NPROCESSORS_ONLN)` \
-#`&& make install` \
-#`&& cd ../../` \
-&& cd thirdparty/nghttp2 \
-&& cmake . \
-&& make install \
-&& ldconfig \
-&& cd ../.. \
 && phpize \
 && ./configure \
-  #`--enable-async-redis` \
   --enable-openssl \
-  --enable-thread \
-  --enable-swoole \
-  --enable-swoole-static \
-  --with-swoole \
-  --with-openssl-dir=/usr \
+  --enable-sockets \
+  --enable-http2 \
   --enable-mysqlnd \
-  --enable-coroutine \
-  --enable-picohttpparser \
-  #`--enable-timewheel` \
-  #`--enable-hugepage` \
-  #`--enable-asan` \
-  #`--with-phpx-dir=` \
-  #`--with-jemalloc-dir=/usr/include/jemalloc` \
-  #`--enable-coroutine-postgresql` \
-  #`--enable-http2` \
-  #`--enable-sockets` \
-  #`--with-libpq-dir=/usr/include/postgresql/libpq/` \
+  --enable-coroutine-postgresql \
 && make -j$(getconf _NPROCESSORS_ONLN) \
 && make install \
  \

diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml
@@ -1342,82 +1342,34 @@ extensions_available:
       git_ref: master
       command: |
         git checkout $(git describe --abbrev=0 --tags) \
-        && git submodule update --init --recursive \
-        #`&& cd thirdparty/hiredis` \
-        #`&& make -j$(getconf _NPROCESSORS_ONLN)` \
-        #`&& make install` \
-        #`&& cd ../../` \
-        && cd thirdparty/nghttp2 \
-        && cmake . \
-        && make install \
-        && ldconfig \
-        && cd ../.. \
         && phpize \
         && ./configure \
-          --enable-async-redis \
           --enable-openssl \
-          --enable-thread \
-          --enable-swoole \
-          --enable-swoole-static \
-          --with-swoole \
-          --with-openssl-dir=/usr \
+          --enable-sockets \
+          --enable-http2 \
           --enable-mysqlnd \
-          --enable-coroutine \
-          --enable-picohttpparser \
-          #`--enable-timewheel` \
-          #`--enable-hugepage` \
-          #`--enable-asan` \
-          #`--with-phpx-dir=` \
-          #`--with-jemalloc-dir=/usr/include/jemalloc` \
-          #`--enable-coroutine-postgresql` \
-          #`--enable-http2` \
-          #`--enable-sockets` \
-          #`--with-libpq-dir=/usr/include/postgresql/libpq/` \
+          --enable-coroutine-postgresql \
         && make -j$(getconf _NPROCESSORS_ONLN) \
         && make install \
       run_dep: [libnghttp2-14, libhiredis0.13]
-      build_dep: [libnghttp2-dev, libssl-dev, libhiredis-dev, cmake]
+      build_dep: [libnghttp2-dev, libssl-dev, libhiredis-dev, libpq-dev, cmake]
     7.4:
       type: git
       git_url: https://github.com/swoole/swoole-src
       git_ref: master
       command: |
         git checkout $(git describe --abbrev=0 --tags) \
-        && git submodule update --init --recursive \
-        #`&& cd thirdparty/hiredis` \
-        #`&& make -j$(getconf _NPROCESSORS_ONLN)` \
-        #`&& make install` \
-        #`&& cd ../../` \
-        && cd thirdparty/nghttp2 \
-        && cmake . \
-        && make install \
-        && ldconfig \
-        && cd ../.. \
         && phpize \
         && ./configure \
-          #`--enable-async-redis` \
           --enable-openssl \
-          --enable-thread \
-          --enable-swoole \
-          --enable-swoole-static \
-          --with-swoole \
-          --with-openssl-dir=/usr \
+          --enable-sockets \
+          --enable-http2 \
           --enable-mysqlnd \
-          --enable-coroutine \
-          --enable-picohttpparser \
-          #`--enable-timewheel` \
-          #`--enable-hugepage` \
-          #`--enable-asan` \
-          #`--with-phpx-dir=` \
-          #`--with-jemalloc-dir=/usr/include/jemalloc` \
-          #`--enable-coroutine-postgresql` \
-          #`--enable-http2` \
-          #`--enable-sockets` \
-          #`--with-libpq-dir=/usr/include/postgresql/libpq/` \
+          --enable-coroutine-postgresql \
         && make -j$(getconf _NPROCESSORS_ONLN) \
         && make install \
       run_dep: [libnghttp2-14, libhiredis0.13]
-      build_dep: [libnghttp2-dev, libssl-dev, libhiredis-dev, cmake]
+      build_dep: [libnghttp2-dev, libssl-dev, libhiredis-dev, libpq-dev, cmake]
     all:
       type: pecl
       build_dep: [libnghttp2-dev, libssl-dev]