Skip to content

Commit 94ed60e

Browse files
tianontianon
authored
Merge pull request #999 from infosiftr/hash-style
Remove "--hash-style=both"
2 parents d669970 + 7ccfc92 commit 94ed60e

File tree

40 files changed

+40
-80
lines changed

40 files changed

+40
-80
lines changed

‎7.2/alpine3.10/cli/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,11 @@ RUN set -eux; \
5353
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
5454
# Enable optimization (-O2)
5555
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
56-
# 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)
5756
# https://github.com/docker-library/php/issues/272
5857
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
5958
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
6059
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
61-
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
60+
ENV PHP_LDFLAGS="-Wl,-O1 -pie"
6261

6362
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
6463

‎7.2/alpine3.10/fpm/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-gr
5454
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
5555
# Enable optimization (-O2)
5656
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
57-
# 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)
5857
# https://github.com/docker-library/php/issues/272
5958
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
6059
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
6160
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
62-
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
61+
ENV PHP_LDFLAGS="-Wl,-O1 -pie"
6362

6463
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
6564

‎7.2/alpine3.10/zts/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
5454
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
5555
# Enable optimization (-O2)
5656
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
57-
# 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)
5857
# https://github.com/docker-library/php/issues/272
5958
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
6059
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
6160
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
62-
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
61+
ENV PHP_LDFLAGS="-Wl,-O1 -pie"
6362

6463
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
6564

‎7.2/alpine3.11/cli/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,11 @@ RUN set -eux; \
5353
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
5454
# Enable optimization (-O2)
5555
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
56-
# 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)
5756
# https://github.com/docker-library/php/issues/272
5857
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
5958
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
6059
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
61-
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
60+
ENV PHP_LDFLAGS="-Wl,-O1 -pie"
6261

6362
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
6463

‎7.2/alpine3.11/fpm/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-gr
5454
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
5555
# Enable optimization (-O2)
5656
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
57-
# 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)
5857
# https://github.com/docker-library/php/issues/272
5958
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
6059
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
6160
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
62-
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
61+
ENV PHP_LDFLAGS="-Wl,-O1 -pie"
6362

6463
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
6564

‎7.2/alpine3.11/zts/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
5454
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
5555
# Enable optimization (-O2)
5656
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
57-
# 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)
5857
# https://github.com/docker-library/php/issues/272
5958
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
6059
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
6160
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
62-
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
61+
ENV PHP_LDFLAGS="-Wl,-O1 -pie"
6362

6463
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
6564

‎7.2/buster/apache/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 --disable-cgi
115115
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
116116
# Enable optimization (-O2)
117117
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
118-
# 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)
119118
# https://github.com/docker-library/php/issues/272
120119
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
121120
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
122121
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
123-
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
122+
ENV PHP_LDFLAGS="-Wl,-O1 -pie"
124123

125124
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
126125

‎7.2/buster/cli/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,11 @@ RUN set -eux; \
5555
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
5656
# Enable optimization (-O2)
5757
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
58-
# 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)
5958
# https://github.com/docker-library/php/issues/272
6059
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
6160
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
6261
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
63-
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
62+
ENV PHP_LDFLAGS="-Wl,-O1 -pie"
6463

6564
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
6665

‎7.2/buster/fpm/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-gr
5656
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
5757
# Enable optimization (-O2)
5858
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
59-
# 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)
6059
# https://github.com/docker-library/php/issues/272
6160
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
6261
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
6362
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
64-
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
63+
ENV PHP_LDFLAGS="-Wl,-O1 -pie"
6564

6665
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
6766

‎7.2/buster/zts/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,11 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts --disable-cgi
5656
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
5757
# Enable optimization (-O2)
5858
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
59-
# 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)
6059
# https://github.com/docker-library/php/issues/272
6160
# -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php)
6261
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
6362
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
64-
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
63+
ENV PHP_LDFLAGS="-Wl,-O1 -pie"
6564

6665
ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F
6766

0 commit comments

Comments
 (0)