Fix gcc version check in php-5.6.

This commit is contained in:
László Valkó 2025-06-30 08:24:41 +02:00
parent 401820d2e0
commit e6db052b2d
3 changed files with 40 additions and 1 deletions

View file

@ -1,5 +1,6 @@
AUX 20php5-envd 145 BLAKE2B 06476b8fc04d1e835496b417ac752f0834ddbe8584e4fddc6db0aa5e6845b82cdea0a1355c77125375dcdd0f0a3c19de5f3a8a64ee93950f96c437a16f971567 SHA512 581aa86479e3cd584ee1bc6dc6d4a135fe8ec343fe5519566d728d81f7018cfb23658bd0c0368951d380982c75adbb4f45acf3c146868aaf4e4ec8e9f2fad1ce
AUX bug81656-gcc-11.patch 1953 BLAKE2B d682840f380693799fa1cf214d199b08862396bc795e88ac9a6ed0c0d12c6b04883301414ea5c3a2d28e204225787d546d3505322280df27105af3ce9d299139 SHA512 11e4c777538b00080cbdfb1a759064368582f894711fc1ff7828a0289d25770bc7a49c768a2a5fef2f89a04b3d9392a78ca0649dd05c67c30cb298320b115edb
AUX php-5.6-gcc-version.patch 1190 BLAKE2B 8a207d4dadb2e807e760fc59f2560f9715ac109bbb1019796ca2baf80ed94c080ba9c28641bbe90abc28caff9bc92d1f5e3ba58141413953283c93fff5977976 SHA512 52fd13aa7a6efc03d1500aafa1c1f3a9077ee402f4b06690c4cd13492188baf9b310a6b41952a8b031ed8a0613f1307430135e3e2e4e1aef9d087a3f63d5a008
AUX php-7.4.33-CVE-2022-31631.patch 1836 BLAKE2B 63a250c6ec5c1b3608f5e2b61118d8903fce8b37764088c57bb6acc82a068b326af4235bd05f21c35a5399616a06dce34a81db71a2b2f558365e220529fc216b SHA512 aca1d76f9674f1602bd8be090bc20f66a64672ea1e6b2a3f76213f285bc8c52159b5495ae1c8c47320229c4c018b73b4d97e4d94837e1876602fa13e39df1cd1
AUX php-7.4.33-CVE-2023-0567.patch 2780 BLAKE2B a35b8f7d24cfb8a325f65e465bd440930876f4b188d1ea5c12d616da39ec75809c13f9e37d08dc5245c7412f21899018f867681ecf89213fc5e7a1b01cb0dd41 SHA512 cdbbe235791027b804c8bbc71a203f954628cbf27af99be34c750dab3c8bf8e3928af87adb87ffe09b2d011c19ed5b339e345d5a55a7053fc82d4c72ba08e8b7
AUX php-7.4.33-CVE-2023-0568.patch 1327 BLAKE2B ab7ad1f83bfeef8da091f159d41371d0f89e3dbcb79c1b7bec7bb76b329c60d2d10e0c6ef9c5c959a57846466a778345e697099e5c2a9555733918cc2faf41f4 SHA512 6015f6025e4e5e29aa699ef9a4b4b28a8f756cca0e83a4e2311c1735f25ef89395d4ea2c143ec45b375128f66b99a4b788e8bfb28d9ee74566345696a1a3c2f0
@ -13,6 +14,6 @@ AUX php-iodbc-header-location.patch 481 BLAKE2B 9ea6a5d529dc7a8c78eeee800900372b
DIST php-5.6.40.tar.xz 12472236 BLAKE2B f41147eaec9b15e965540f9e871691cc88848dd619bae6af85e7bba0130b71ce91bad5cdbbadbb537c42df83369f5c731007339a9d9e21e689e913c135201afc SHA512 997b5a952a60cf9166671cc91fcc34c674dd62bfd5cb0a9cdf3fdf2d088b5d19943d94c1cf193f8ab71fc4957d9a9a4c7c2fb8826f937501c1c0a0858f10e329
DIST php-7.4.33.tar.xz 10420144 BLAKE2B e75817e79c698628c873c90afb3b5677480d03ecf07e8f2e26a062bc5b91affc6079e792e864f28cf12d45f86e5d01ede289ecdcefc06477986d193d22c982ef SHA512 499b63b99e5d8e8082ff89d3a91b4cb9a593ea7553b96e48863414c13d2e50275904ed29070e2232e529ee91160f505e6060a4d129cb5bf098aa5b6ea0928d3d
DIST php-patches-7.1.33bp.mod.tar.bz2 39759 BLAKE2B 4cfd7d606f58b652e8fa1d76948eb1e288985aa986005f1c648ef51ce5ad31ac1b04c6d5f1743758d08cabd05fae12a726a1ce95d03e6ee34aed6d42411bbf69 SHA512 b89073a78d2f3efeaa5407bb9ed601b663173d5396d3a737093d0f2f4c8ef89da41a051cf18759495af8f86084dd2cd049233c2cea4c001bc1ba61ed43b0513e
EBUILD php-5.6.40-r7.ebuild 23077 BLAKE2B 202b50ce2d0d79ab077a93c0a1733272ce3d2d85981134b16145b2af454d6b429643164ee4b262aec95302c3d84533a263c9b3cdb810ed349667973fe828b8fc SHA512 e919fbd083141225c60b69c62de2622c7d4171dc01fef7a43d168cbf0cbc2a9229526b5ce5251e5f338125462e7402c408e8f11e62109c0eb722ffb0a86af7f7
EBUILD php-5.6.40-r7.ebuild 23118 BLAKE2B fd3bb65ca6243c6d00caebddcb27683562fb64072f8ff2dbaec20a50c01ce2e2b21ab0a79c2f90a1f42806827d8ff84281b6161ad5892183eb2870fe5dd12c4e SHA512 a4e0b16804cbce2b7fcd138fcb8588394ea956f8141317c458cb689fbe9f3108212a5f0844c1c7ac5419a463b3e9601467f8b811e9a0604cf91b80c129d646f4
EBUILD php-7.4.33-r5.ebuild 21583 BLAKE2B 183288ed287220d94fff7c55805e5683b37fad6f04bdcb22a8ab5e0d10fa32454538f7fd2374293eeb4ce2d3cf6ee3d186833db30bf7985738056f03ae4857b0 SHA512 8178b4c9b5bee11d915e69489bb3a3551e6aa9d97f81fd5251e7c194fdca78c83b50cee203a2274a322c0b5b96801594a505a64111c966776ec4bdf2a410903e
MISC metadata.xml 3352 BLAKE2B 155c08bb52b049c3f79557d27ab6be9402cd35797cd385d53fc8c239c0eca089f65e106d54beca0642b8d182bfd0e172886b863a692575e9002140af7a62fa08 SHA512 f37c4c7b709bf91da6db41b0468c36cebffc630dabdcf4d43259017be5cf0577bb329ed0e206ff14d68bacc33425fba4789fc13fa34aa61acccce9fda11eee86

View file

@ -0,0 +1,37 @@
diff '--color=auto' -Naur a/configure.in b/configure.in
--- a/configure.in 2019-01-09 10:54:13.000000000 +0100
+++ b/configure.in 2025-07-01 03:29:02.099836863 +0200
@@ -285,20 +285,10 @@
;;
esac
-dnl activate some gcc specific optimizations for gcc >= 4
-if test "$GCC" = "yes"; then
- case $host_alias in
- *darwin*)
- GCC_MAJOR_VERSION=`$CC -dumpversion | /usr/bin/sed -nE '1s/([[0-9]]+)\.[[0-9]]+\..*/\1/;1p'`
- ;;
- *)
- GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[[^0-9]]*//;1s/\..*//;1p'`
- ;;
- esac
- if test $GCC_MAJOR_VERSION -ge 4; then
- CFLAGS="$CFLAGS -fvisibility=hidden"
- fi
-fi
+dnl Mark symbols hidden by default if the compiler (for example, gcc >= 4)
+dnl supports it. This can help reduce the binary size and startup time.
+AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],
+ [CFLAGS="$CFLAGS -fvisibility=hidden"])
case $host_alias in
*solaris*)
@@ -364,8 +354,6 @@
dnl -------------------------------------------------------------------------
sinclude(Zend/Zend.m4)
-sinclude(TSRM/threads.m4)
-sinclude(TSRM/tsrm.m4)
dnl .
dnl -------------------------------------------------------------------------

View file

@ -182,6 +182,7 @@ PHP_MV="$(ver_cut 1)"
PATCHES=(
"${FILESDIR}"/php-icu-fix.patch
"${FILESDIR}"/php-icu-70.patch
"${FILESDIR}"/php-5.6-gcc-version.patch
)
php_install_ini() {