Skip to content

Commit 9dac3d0

Browse files
henderkestianon
andauthored
don't explicitly --enable-pic for ZTS (#1692)
Co-authored-by: Tianon Gravi <admwiggin@gmail.com>
1 parent 152df2d commit 9dac3d0

9 files changed

Lines changed: 11 additions & 33 deletions

File tree

‎8.6-rc/alpine3.23/cli/Dockerfile‎

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎8.6-rc/alpine3.23/fpm/Dockerfile‎

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎8.6-rc/alpine3.24/cli/Dockerfile‎

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎8.6-rc/alpine3.24/fpm/Dockerfile‎

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎8.6-rc/bookworm/cli/Dockerfile‎

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎8.6-rc/bookworm/fpm/Dockerfile‎

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎8.6-rc/trixie/cli/Dockerfile‎

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎8.6-rc/trixie/fpm/Dockerfile‎

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Dockerfile-linux.template‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,11 +374,13 @@ RUN set -eux; \
374374
# https://github.com/docker-library/php/issues/822
375375
--with-pic \
376376
\
377-
{{ ) else ( -}}
377+
{{ ) elif env.variant == "apache" then ( -}}
378378
# https://github.com/docker-library/php/issues/822
379379
# https://github.com/php/php-src/pull/21067/changes#diff-4b9db5b77bcd56aa33b310dc44c8bc99c729c9abb195df2e98e6985b81289ae8R130
380380
--enable-pic \
381381
\
382+
{{ ) else ( -}}
383+
# no --enable-pic; forcing PIC also removes -fpie from executable objects, preventing local-exec TLS: https://github.com/docker-library/php/pull/1692
382384
{{ ) end -}}
383385
{{ if install_pear_pecl then ( -}}
384386
# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)

0 commit comments

Comments
 (0)