Skip to content

Commit

Permalink
php 8.4.1
Browse files Browse the repository at this point in the history
php: update build patches

Signed-off-by: Rui Chen <[email protected]>
  • Loading branch information
BrewTestBot authored and chenrui333 committed Nov 21, 2024
1 parent bcfa19a commit 2215d0f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 17 deletions.
File renamed without changes.
24 changes: 7 additions & 17 deletions Formula/p/php.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ class Php < Formula
desc "General-purpose scripting language"
homepage "https://www.php.net/"
# Should only be updated if the new version is announced on the homepage, https://www.php.net/
url "https://www.php.net/distributions/php-8.3.13.tar.xz"
mirror "https://fossies.org/linux/www/php-8.3.13.tar.xz"
sha256 "89adb978cca209124fe53fd6327bc4966ca21213a7fa2e9504f854e340873018"
url "https://www.php.net/distributions/php-8.4.1.tar.xz"
mirror "https://fossies.org/linux/www/php-8.4.1.tar.xz"
sha256 "94c8a4fd419d45748951fa6d73bd55f6bdf0adaefb8814880a67baa66027311f"
license "PHP-3.01"
revision 1

livecheck do
url "https://www.php.net/downloads"
Expand Down Expand Up @@ -73,11 +72,11 @@ def install
system "./buildconf", "--force"

inreplace "configure" do |s|
s.gsub! "APACHE_THREADED_MPM=`$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes'`",
"APACHE_THREADED_MPM="
s.gsub! "APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`",
s.gsub! "$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes' >/dev/null 2>&1",
"false"
s.gsub! "APXS_LIBEXECDIR='$(INSTALL_ROOT)'$($APXS -q LIBEXECDIR)",
"APXS_LIBEXECDIR='$(INSTALL_ROOT)#{lib}/httpd/modules'"
s.gsub! "-z `$APXS -q SYSCONFDIR`",
s.gsub! "-z $($APXS -q SYSCONFDIR)",
"-z ''"
end

Expand Down Expand Up @@ -442,15 +441,6 @@ def caveats
PHP_EXPAND_PATH($1, ai_p)
ifelse([$2],,[
_PHP_ADD_LIBPATH_GLOBAL([$ai_p])
@@ -470,7 +470,7 @@ dnl
dnl Add an include path. If before is 1, add in the beginning of INCLUDES.
dnl
AC_DEFUN([PHP_ADD_INCLUDE],[
- if test "$1" != "/usr/include"; then
+ if test "$1" != "$PHP_OS_SDKPATH/usr/include"; then
PHP_EXPAND_PATH($1, ai_p)
PHP_RUN_ONCE(INCLUDEPATH, $ai_p, [
if test "$2"; then
diff --git a/configure.ac b/configure.ac
index 36c6e5e3e2..71b1a16607 100644
--- a/configure.ac
Expand Down

0 comments on commit 2215d0f

Please sign in to comment.