Skip to content

Commit 1335a9a

Browse files
committed
Add library for "asm/hwcap.h" to fix arm64 build
1 parent d367f7f commit 1335a9a

File tree

5 files changed

+10
-0
lines changed

5 files changed

+10
-0
lines changed

7.4-rc/alpine3.10/cli/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ RUN set -eux; \
105105
libedit-dev \
106106
libsodium-dev \
107107
libxml2-dev \
108+
linux-headers \
108109
oniguruma-dev \
109110
openssl-dev \
110111
sqlite-dev \

7.4-rc/alpine3.10/fpm/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ RUN set -eux; \
106106
libedit-dev \
107107
libsodium-dev \
108108
libxml2-dev \
109+
linux-headers \
109110
oniguruma-dev \
110111
openssl-dev \
111112
sqlite-dev \

7.4-rc/alpine3.10/zts/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ RUN set -eux; \
106106
libedit-dev \
107107
libsodium-dev \
108108
libxml2-dev \
109+
linux-headers \
109110
oniguruma-dev \
110111
openssl-dev \
111112
sqlite-dev \

Dockerfile-alpine.template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ RUN set -eux; \
9999
libedit-dev \
100100
libsodium-dev \
101101
libxml2-dev \
102+
linux-headers \
102103
oniguruma-dev \
103104
openssl-dev \
104105
sqlite-dev \

update.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,12 @@ for version in "${versions[@]}"; do
203203
-e '/freetype-config/d' \
204204
"$version/$suite/$variant/Dockerfile"
205205
fi
206+
if [[ "$suite" == alpine* ]] && [ "$majorVersion" = '7' ] && [ "$minorVersion" -lt '4' ]; then
207+
# https://github.com/docker-library/php/issues/888
208+
sed -ri \
209+
-e '/linux-headers/d' \
210+
"$version/$suite/$variant/Dockerfile"
211+
fi
206212

207213
# remove any _extra_ blank lines created by the deletions above
208214
gawk '

0 commit comments

Comments
 (0)