From e15658225272687681d7f6bf86b27460e9b7d649 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 23 Jan 2022 16:18:26 +0100 Subject: [PATCH] Fixed building sockets on PHP 8.0 and PHP 8.1 --- Dockerfiles/mods/Dockerfile-8.0 | 4 ++++ Dockerfiles/mods/Dockerfile-8.1 | 4 ++++ build/ansible/group_vars/all/mods.yml | 10 ++++++++++ 3 files changed, 18 insertions(+) diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0 index d563308..b953a72 100644 --- a/Dockerfiles/mods/Dockerfile-8.0 +++ b/Dockerfiles/mods/Dockerfile-8.0 @@ -502,6 +502,10 @@ RUN set -eux \ # -------------------- Installing PHP Extension: sockets -------------------- RUN set -eux \ + # Version specific pre-command + && docker-php-ext-configure sockets \ +&& sed -i'' 's/.*ucred.*//g' /usr/src/php/ext/sockets/sendrecvmsg.c \ + \ # Installation: Generic # Type: Built-in extension && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \ diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1 index b9a9960..32a165c 100644 --- a/Dockerfiles/mods/Dockerfile-8.1 +++ b/Dockerfiles/mods/Dockerfile-8.1 @@ -457,6 +457,10 @@ RUN set -eux \ # -------------------- Installing PHP Extension: sockets -------------------- RUN set -eux \ + # Version specific pre-command + && docker-php-ext-configure sockets \ +&& sed -i'' 's/.*ucred.*//g' /usr/src/php/ext/sockets/sendrecvmsg.c \ + \ # Installation: Generic # Type: Built-in extension && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \ diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index d299059..97f430e 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -986,6 +986,16 @@ extensions_available: configure: --with-libxml-dir=/usr build_dep: [libxml2-dev] sockets: + 8.0: + # Remove ucred (currently breaks build) + pre: | + docker-php-ext-configure sockets \ + && sed -i'' 's/.*ucred.*//g' /usr/src/php/ext/sockets/sendrecvmsg.c \ + 8.1: + # Remove ucred (currently breaks build) + pre: | + docker-php-ext-configure sockets \ + && sed -i'' 's/.*ucred.*//g' /usr/src/php/ext/sockets/sendrecvmsg.c \ all: type: builtin sodium: