Skip to content

Commit 9f2e76e

Browse files
yosifkityosifkit
committed
Update.sh: apply "CFLAGS -> PHP_CFLAGS" to all the things
1 parent bb4874c commit 9f2e76e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+378
-63
lines changed

‎5.6/Dockerfile‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
3838
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
3939
# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
4040
# https://github.com/docker-library/php/issues/272
41-
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
42-
ENV CPPFLAGS="$CFLAGS"
43-
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
41+
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
42+
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
43+
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
4444

4545
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
4646

@@ -94,6 +94,9 @@ RUN set -xe \
9494
" \
9595
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
9696
\
97+
&& export CFLAGS="$PHP_CFLAGS" \
98+
CPPFLAGS="$PHP_CPPFLAGS" \
99+
LDFLAGS="$PHP_LDFLAGS" \
97100
&& docker-php-source extract \
98101
&& cd /usr/src/php \
99102
&& ./configure \

‎5.6/alpine/Dockerfile‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
4343
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
4444
# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
4545
# https://github.com/docker-library/php/issues/272
46-
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
47-
ENV CPPFLAGS="$CFLAGS"
48-
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
46+
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
47+
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
48+
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
4949

5050
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
5151

@@ -95,6 +95,9 @@ RUN set -xe \
9595
openssl-dev \
9696
sqlite-dev \
9797
\
98+
&& export CFLAGS="$PHP_CFLAGS" \
99+
CPPFLAGS="$PHP_CPPFLAGS" \
100+
LDFLAGS="$PHP_LDFLAGS" \
98101
&& docker-php-source extract \
99102
&& cd /usr/src/php \
100103
&& ./configure \

‎5.6/alpine/docker-php-ext-configure‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
#!/bin/sh
22
set -e
33

4+
# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
5+
: ${CFLAGS:=$PHP_CFLAGS}
6+
: ${CPPFLAGS:=$PHP_CPPFLAGS}
7+
: ${LDFLAGS:=$PHP_LDFLAGS}
8+
export CFLAGS CPPFLAGS LDFLAGS
9+
410
srcExists=
511
if [ -d /usr/src/php ]; then
612
srcExists=1

‎5.6/alpine/docker-php-ext-install‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
#!/bin/sh
22
set -e
33

4+
# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
5+
: ${CFLAGS:=$PHP_CFLAGS}
6+
: ${CPPFLAGS:=$PHP_CPPFLAGS}
7+
: ${LDFLAGS:=$PHP_LDFLAGS}
8+
export CFLAGS CPPFLAGS LDFLAGS
9+
410
srcExists=
511
if [ -d /usr/src/php ]; then
612
srcExists=1

‎5.6/apache/Dockerfile‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
9494
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
9595
# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
9696
# https://github.com/docker-library/php/issues/272
97-
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
98-
ENV CPPFLAGS="$CFLAGS"
99-
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
97+
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
98+
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
99+
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
100100

101101
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
102102

@@ -150,6 +150,9 @@ RUN set -xe \
150150
" \
151151
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
152152
\
153+
&& export CFLAGS="$PHP_CFLAGS" \
154+
CPPFLAGS="$PHP_CPPFLAGS" \
155+
LDFLAGS="$PHP_LDFLAGS" \
153156
&& docker-php-source extract \
154157
&& cd /usr/src/php \
155158
&& ./configure \

‎5.6/apache/docker-php-ext-configure‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
#!/bin/sh
22
set -e
33

4+
# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
5+
: ${CFLAGS:=$PHP_CFLAGS}
6+
: ${CPPFLAGS:=$PHP_CPPFLAGS}
7+
: ${LDFLAGS:=$PHP_LDFLAGS}
8+
export CFLAGS CPPFLAGS LDFLAGS
9+
410
srcExists=
511
if [ -d /usr/src/php ]; then
612
srcExists=1

‎5.6/apache/docker-php-ext-install‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
#!/bin/sh
22
set -e
33

4+
# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
5+
: ${CFLAGS:=$PHP_CFLAGS}
6+
: ${CPPFLAGS:=$PHP_CPPFLAGS}
7+
: ${LDFLAGS:=$PHP_LDFLAGS}
8+
export CFLAGS CPPFLAGS LDFLAGS
9+
410
srcExists=
511
if [ -d /usr/src/php ]; then
612
srcExists=1

‎5.6/docker-php-ext-configure‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
#!/bin/sh
22
set -e
33

4+
# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
5+
: ${CFLAGS:=$PHP_CFLAGS}
6+
: ${CPPFLAGS:=$PHP_CPPFLAGS}
7+
: ${LDFLAGS:=$PHP_LDFLAGS}
8+
export CFLAGS CPPFLAGS LDFLAGS
9+
410
srcExists=
511
if [ -d /usr/src/php ]; then
612
srcExists=1

‎5.6/docker-php-ext-install‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
#!/bin/sh
22
set -e
33

4+
# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
5+
: ${CFLAGS:=$PHP_CFLAGS}
6+
: ${CPPFLAGS:=$PHP_CPPFLAGS}
7+
: ${LDFLAGS:=$PHP_LDFLAGS}
8+
export CFLAGS CPPFLAGS LDFLAGS
9+
410
srcExists=
511
if [ -d /usr/src/php ]; then
612
srcExists=1

‎5.6/fpm/Dockerfile‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-gr
3939
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
4040
# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
4141
# https://github.com/docker-library/php/issues/272
42-
ENV CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
43-
ENV CPPFLAGS="$CFLAGS"
44-
ENV LDFLAGS="-Wl,-O1 -Wl,--hash-style=both"
42+
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
43+
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
44+
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
4545

4646
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
4747

@@ -95,6 +95,9 @@ RUN set -xe \
9595
" \
9696
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
9797
\
98+
&& export CFLAGS="$PHP_CFLAGS" \
99+
CPPFLAGS="$PHP_CPPFLAGS" \
100+
LDFLAGS="$PHP_LDFLAGS" \
98101
&& docker-php-source extract \
99102
&& cd /usr/src/php \
100103
&& ./configure \

0 commit comments

Comments
 (0)