gh-mirrors/docker-php-fpm
1
0
Fork 0
mirror of https://github.com/devilbox/docker-php-fpm.git synced 2025-12-11 03:21:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix gd build for PHP 5.2 and PHP 5.3

Browse Source
This commit is contained in:
cytopia
2022-03-17 16:55:34 +01:00
parent 20c5b88e52
commit 207b78df6f
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfiles/mods/Dockerfile-5.2
View File

@@ -166,8 +166,6 @@ RUN set -eux \
&& ln -s /usr/lib/x86_64-linux-gnu/libjpeg.* /usr/lib/ && \ && ln -s /usr/lib/x86_64-linux-gnu/libjpeg.* /usr/lib/ && \
ln -s /usr/lib/x86_64-linux-gnu/libpng.* /usr/lib/ && \ ln -s /usr/lib/x86_64-linux-gnu/libpng.* /usr/lib/ && \
ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && \ ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && \
mkdir -p /usr/include/freetype2/freetype && \
ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \
\ \
# Installation: Version specific # Installation: Version specific
# Type: Built-in extension # Type: Built-in extension

2
Dockerfiles/mods/Dockerfile-5.3
View File

@@ -165,7 +165,7 @@ RUN set -eux \
# -------------------- Installing PHP Extension: gd -------------------- # -------------------- Installing PHP Extension: gd --------------------
RUN set -eux \ RUN set -eux \
# Version specific pre-command # Version specific pre-command
&& ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && mkdir -p /usr/include/freetype2/freetype && ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \ && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \
# Installation: Version specific # Installation: Version specific
# Type: Built-in extension # Type: Built-in extension
# Custom: configure command # Custom: configure command

4
build/ansible/group_vars/all/mods.yml
View File

@@ -279,14 +279,12 @@ extensions_available:
ln -s /usr/lib/x86_64-linux-gnu/libjpeg.* /usr/lib/ && \ ln -s /usr/lib/x86_64-linux-gnu/libjpeg.* /usr/lib/ && \
ln -s /usr/lib/x86_64-linux-gnu/libpng.* /usr/lib/ && \ ln -s /usr/lib/x86_64-linux-gnu/libpng.* /usr/lib/ && \
ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && \ ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && \
mkdir -p /usr/include/freetype2/freetype && \
ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \
configure: --with-gd --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-native-ttf configure: --with-gd --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-native-ttf
build_dep: [libpng-dev, libjpeg-dev, libxpm-dev, libvpx-dev, zlib1g-dev, libfreetype6-dev] build_dep: [libpng-dev, libjpeg-dev, libxpm-dev, libvpx-dev, zlib1g-dev, libfreetype6-dev]
run_dep: [libpng12-0, libjpeg62-turbo, libxpm4, libvpx1, libfreetype6] run_dep: [libpng12-0, libjpeg62-turbo, libxpm4, libvpx1, libfreetype6]
5.3: 5.3:
type: builtin type: builtin
pre: ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && mkdir -p /usr/include/freetype2/freetype && ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h pre: ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/
configure: --with-gd --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-native-ttf configure: --with-gd --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-native-ttf
build_dep: [libpng-dev, libjpeg-dev, libxpm-dev, libvpx-dev, zlib1g-dev, libfreetype6-dev] build_dep: [libpng-dev, libjpeg-dev, libxpm-dev, libvpx-dev, zlib1g-dev, libfreetype6-dev]
run_dep: [libpng12-0, libjpeg62-turbo, libxpm4, libvpx1, libfreetype6] run_dep: [libpng12-0, libjpeg62-turbo, libxpm4, libvpx1, libfreetype6]