Skip to content

Commit 2513c9b

Browse files
committed
Moved libffi-devel installation to the correct place
1 parent b2d0afc commit 2513c9b

File tree

5 files changed

+15
-16
lines changed

5 files changed

+15
-16
lines changed

php-80/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ RUN set -xe \
1818
# Download yum repository data to cache
1919
&& yum makecache \
2020
# Install default development tools (gcc, make, etc)
21-
&& yum groupinstall -y "Development Tools" --setopt=group_package_types=mandatory,default \
22-
&& yum install -y libffi libffi-devel
21+
&& yum groupinstall -y "Development Tools" --setopt=group_package_types=mandatory,default
2322

2423

2524
# The default version of cmake is 2.8.12. We need cmake to build a few of
@@ -381,8 +380,8 @@ RUN make && make install
381380
# libicu-devel : needed for intl
382381
# libxslt-devel : needed for the XSL extension
383382
# sqlite-devel : Since PHP 7.4 this must be installed (https://github.com/php/php-src/blob/99b8e67615159fc600a615e1e97f2d1cf18f14cb/UPGRADING#L616-L619)
384-
RUN LD_LIBRARY_PATH= yum install -y readline-devel gettext-devel libicu-devel libxslt-devel sqlite-devel
385-
383+
# libffi-devel : needed for the FFI extension
384+
RUN LD_LIBRARY_PATH= yum install -y readline-devel gettext-devel libicu-devel libxslt-devel sqlite-devel libffi-devel
386385

387386
# Note: this variable is used when building extra/custom extensions, do not remove
388387
ENV PHP_BUILD_DIR=/tmp/php

php-81/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ RUN set -xe \
1818
# Download yum repository data to cache
1919
&& yum makecache \
2020
# Install default development tools (gcc, make, etc)
21-
&& yum groupinstall -y "Development Tools" --setopt=group_package_types=mandatory,default \
22-
&& yum install -y libffi libffi-devel
21+
&& yum groupinstall -y "Development Tools" --setopt=group_package_types=mandatory,default
2322

2423

2524
# The default version of cmake is 2.8.12. We need cmake to build a few of
@@ -402,7 +401,8 @@ RUN make && make install
402401
# gettext-devel : needed for the --with-gettext flag
403402
# libicu-devel : needed for intl
404403
# libxslt-devel : needed for the XSL extension
405-
RUN LD_LIBRARY_PATH= yum install -y readline-devel gettext-devel libicu-devel libxslt-devel
404+
# libffi-devel : needed for the FFI extension
405+
RUN LD_LIBRARY_PATH= yum install -y readline-devel gettext-devel libicu-devel libxslt-devel libffi-devel
406406

407407

408408
# Note: this variable is used when building extra/custom extensions, do not remove

php-82/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ RUN set -xe \
1818
# Download yum repository data to cache
1919
&& yum makecache \
2020
# Install default development tools (gcc, make, etc)
21-
&& yum groupinstall -y "Development Tools" --setopt=group_package_types=mandatory,default \
22-
&& yum install -y libffi libffi-devel
21+
&& yum groupinstall -y "Development Tools" --setopt=group_package_types=mandatory,default
2322

2423

2524
# The default version of cmake is 2.8.12. We need cmake to build a few of
@@ -402,7 +401,8 @@ RUN make && make install
402401
# gettext-devel : needed for the --with-gettext flag
403402
# libicu-devel : needed for intl
404403
# libxslt-devel : needed for the XSL extension
405-
RUN LD_LIBRARY_PATH= yum install -y readline-devel gettext-devel libicu-devel libxslt-devel
404+
# libffi-devel : needed for the FFI extension
405+
RUN LD_LIBRARY_PATH= yum install -y readline-devel gettext-devel libicu-devel libxslt-devel libffi-devel
406406

407407

408408
# Note: this variable is used when building extra/custom extensions, do not remove

php-83/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ RUN set -xe \
1818
# Download yum repository data to cache
1919
&& yum makecache \
2020
# Install default development tools (gcc, make, etc)
21-
&& yum groupinstall -y "Development Tools" --setopt=group_package_types=mandatory,default \
22-
&& yum install -y libffi libffi-devel
21+
&& yum groupinstall -y "Development Tools" --setopt=group_package_types=mandatory,default
2322

2423

2524
# The default version of cmake is 2.8.12. We need cmake to build a few of
@@ -402,7 +401,8 @@ RUN make && make install
402401
# gettext-devel : needed for the --with-gettext flag
403402
# libicu-devel : needed for intl
404403
# libxslt-devel : needed for the XSL extension
405-
RUN LD_LIBRARY_PATH= yum install -y readline-devel gettext-devel libicu-devel libxslt-devel
404+
# libffi-devel : needed for the FFI extension
405+
RUN LD_LIBRARY_PATH= yum install -y readline-devel gettext-devel libicu-devel libxslt-devel libffi-devel
406406

407407

408408
# Note: this variable is used when building extra/custom extensions, do not remove

php-84/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ RUN set -xe \
1818
# Download yum repository data to cache
1919
&& yum makecache \
2020
# Install default development tools (gcc, make, etc)
21-
&& yum groupinstall -y "Development Tools" --setopt=group_package_types=mandatory,default \
22-
&& yum install -y libffi libffi-devel
21+
&& yum groupinstall -y "Development Tools" --setopt=group_package_types=mandatory,default
2322

2423

2524
# The default version of cmake is 2.8.12. We need cmake to build a few of
@@ -405,7 +404,8 @@ RUN make && make install
405404
# gettext-devel : needed for the --with-gettext flag
406405
# libicu-devel : needed for intl
407406
# libxslt-devel : needed for the XSL extension
408-
RUN LD_LIBRARY_PATH= yum install -y readline-devel gettext-devel libicu-devel libxslt-devel
407+
# libffi-devel : needed for the FFI extension
408+
RUN LD_LIBRARY_PATH= yum install -y readline-devel gettext-devel libicu-devel libxslt-devel libffi-devel
409409

410410

411411
# Note: this variable is used when building extra/custom extensions, do not remove

0 commit comments

Comments
 (0)