[dev-lang/php] update to inode64 version

This commit is contained in:
2025-03-31 21:40:45 +02:00
parent 8046ba7502
commit 4075801cb5
6 changed files with 38 additions and 128 deletions

View File

@@ -1,53 +0,0 @@
From bb00a649e0c1ac57718cd9971e7e6f933cb2dadd Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Thu, 25 Nov 2021 07:43:14 +0100
Subject: [PATCH] fix #81656: GCC-11 silently ignores -R
---
build/php.m4 | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/build/php.m4 b/build/php.m4
index 3af2b8b72d47..4697c5df9274 100644
--- a/build/php.m4
+++ b/build/php.m4
@@ -279,25 +279,25 @@ dnl
dnl Checks for -R, etc. switch.
dnl
AC_DEFUN([PHP_RUNPATH_SWITCH],[
-AC_MSG_CHECKING([if compiler supports -R])
-AC_CACHE_VAL(php_cv_cc_dashr,[
+AC_MSG_CHECKING([if compiler supports -Wl,-rpath,])
+AC_CACHE_VAL(php_cv_cc_rpath,[
SAVE_LIBS=$LIBS
- LIBS="-R /usr/$PHP_LIBDIR $LIBS"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],[php_cv_cc_dashr=yes],[php_cv_cc_dashr=no])
+ LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],[php_cv_cc_rpath=yes],[php_cv_cc_rpath=no])
LIBS=$SAVE_LIBS])
-AC_MSG_RESULT([$php_cv_cc_dashr])
-if test $php_cv_cc_dashr = "yes"; then
- ld_runpath_switch=-R
+AC_MSG_RESULT([$php_cv_cc_rpath])
+if test $php_cv_cc_rpath = "yes"; then
+ ld_runpath_switch=-Wl,-rpath,
else
- AC_MSG_CHECKING([if compiler supports -Wl,-rpath,])
- AC_CACHE_VAL(php_cv_cc_rpath,[
+ AC_MSG_CHECKING([if compiler supports -R])
+ AC_CACHE_VAL(php_cv_cc_dashr,[
SAVE_LIBS=$LIBS
- LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],[php_cv_cc_rpath=yes],[php_cv_cc_rpath=no])
+ LIBS="-R /usr/$PHP_LIBDIR $LIBS"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],[php_cv_cc_dashr=yes],[php_cv_cc_dashr=no])
LIBS=$SAVE_LIBS])
- AC_MSG_RESULT([$php_cv_cc_rpath])
- if test $php_cv_cc_rpath = "yes"; then
- ld_runpath_switch=-Wl,-rpath,
+ AC_MSG_RESULT([$php_cv_cc_dashr])
+ if test $php_cv_cc_dashr = "yes"; then
+ ld_runpath_switch=-R
else
dnl Something innocuous.
ld_runpath_switch=-L

View File

@@ -1,34 +0,0 @@
From cc46a4e6b5a413bab3e264c1dcaaf7052f54fbc4 Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen@gmail.com>
Date: Sat, 17 Feb 2024 21:38:21 +0000
Subject: [PATCH] ext/intl: level up c++ runtime std for icu 74 and onwards.
to align with what is required to build icu 74 itself.
Close GH-14002
---
ext/intl/config.m4 | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ext/intl/config.m4 b/ext/intl/config.m4
index dd687bcd97de3..48f5147ca7bbf 100644
--- a/ext/intl/config.m4
+++ b/ext/intl/config.m4
@@ -80,7 +80,16 @@ if test "$PHP_INTL" != "no"; then
breakiterator/codepointiterator_methods.cpp"
PHP_REQUIRE_CXX()
- PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX)
+
+ AC_MSG_CHECKING([if intl requires -std=gnu++17])
+ AS_IF([test "$PKG_CONFIG icu-uc --atleast-version=74"],[
+ AC_MSG_RESULT([yes])
+ PHP_CXX_COMPILE_STDCXX(17, mandatory, PHP_INTL_STDCXX)
+ ],[
+ AC_MSG_RESULT([no])
+ PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX)
+ ])
+
PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $PHP_INTL_STDCXX $ICU_CXXFLAGS"
case $host_alias in
*cygwin*) PHP_INTL_CXX_FLAGS="$PHP_INTL_CXX_FLAGS -D_POSIX_C_SOURCE=200809L"

View File

@@ -11,4 +11,3 @@ PrivateTmp=true
[Install]
WantedBy=multi-user.target

View File

@@ -1,14 +0,0 @@
diff -aurN a/ext/pdo_odbc/config.m4 b/ext/pdo_odbc/config.m4
--- a/ext/pdo_odbc/config.m4 2019-11-26 15:13:39.000000000 -0500
+++ b/ext/pdo_odbc/config.m4 2019-12-06 10:39:56.296658492 -0500
@@ -85,6 +85,10 @@
PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir"
fi
+ if test "$pdo_odbc_def_lib" = "iodbc" ; then
+ PDO_ODBC_INCDIR="$PDO_ODBC_INCDIR/iodbc"
+ fi
+
AC_MSG_RESULT([$pdo_odbc_flavour
libs $PDO_ODBC_LIBDIR,
headers $PDO_ODBC_INCDIR])