Refresh PHP 8.4 patches

shivammathur · Jul 4, 2024 · 62490c4 · 62490c4
1 parent 8b69266
commit 62490c4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/config/patches/8.4/0002-debian_quirks.patch b/config/patches/8.4/0002-debian_quirks.patch
@@ -14,7 +14,7 @@ Subject: debian_quirks
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1159,7 +1159,7 @@ fi
+@@ -1177,7 +1177,7 @@ AS_VAR_IF([PHP_CLI], [no], [with_pear=no])
  PHP_ARG_WITH([pear],
    [whether to install PEAR],
    [AS_HELP_STRING([[--with-pear[=DIR]]],
@@ -23,16 +23,16 @@ Subject: debian_quirks
    [no],
    [yes])
 
-@@ -1190,6 +1190,8 @@ if test "$PHP_PEAR" != "no"; then
-   PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear)
- fi
+@@ -1205,6 +1205,8 @@ AS_VAR_IF([PHP_PEAR], [no],, [
+     [pear])
+ ])
 
 +PEAR_INSTALLDIR=/usr/share/php
 +
  dnl Configuring Zend and TSRM.
  dnl ----------------------------------------------------------------------------
 
-@@ -1319,6 +1321,8 @@ datadir=`eval eval echo $datadir`
+@@ -1380,6 +1382,8 @@ datadir=`eval eval echo $datadir`
  dnl Build extension directory path.
  ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|"${SED}" 's/#define ZEND_MODULE_API_NO //'`
 

diff --git a/config/patches/8.4/0004-extension_api.patch b/config/patches/8.4/0004-extension_api.patch
@@ -9,26 +9,26 @@ Subject: extension_api
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1401,8 +1401,10 @@ ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modul
+@@ -1384,8 +1384,11 @@ ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modul
 
  AC_SUBST(ZEND_MODULE_API_NO)
 
 +DEBIAN_PHP_API=$ZEND_MODULE_API_NO
 +
  if test -z "$EXTENSION_DIR"; then
--  extbasedir=$ZEND_MODULE_API_NO
+   extbasedir=$ZEND_MODULE_API_NO
 +  extbasedir=$DEBIAN_PHP_API
    if test "$oldstyleextdir" = "yes"; then
      if test "$PHP_DEBUG" = "1"; then
        part1=debug
-@@ -1534,6 +1536,7 @@ PHP_SUBST(CXX)
- PHP_SUBST(CXXFLAGS)
- PHP_SUBST(CXXFLAGS_CLEAN)
- PHP_SUBST_OLD(DEBUG_CFLAGS)
-+PHP_SUBST_OLD(DEBIAN_PHP_API)
- PHP_SUBST_OLD(EXTENSION_DIR)
- PHP_SUBST_OLD(EXTRA_LDFLAGS)
- PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)
+@@ -1514,6 +1517,7 @@ PHP_SUBST([CPPFLAGS])
+ PHP_SUBST([CXX])
+ PHP_SUBST([CXXFLAGS])
+ PHP_SUBST([CXXFLAGS_CLEAN])
++PHP_SUBST_OLD([DEBIAN_PHP_API])
+ PHP_SUBST_OLD([EXTENSION_DIR])
+ PHP_SUBST([EXTRA_LDFLAGS])
+ PHP_SUBST([EXTRA_LDFLAGS_PROGRAM])
 --- a/scripts/php-config.in
 +++ b/scripts/php-config.in
 @@ -20,6 +20,7 @@ php_cli_binary=NONE