Unverified Commit 889d0b35 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge: php84: 8.4.0beta3 -> 8.4.0RC3 (#353025)

parents 8867c791 42275160

pkgs/development/interpreters/php/8.4.nix

+3 −3
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ let 
  base = callPackage ./generic.nix (

    _args

    // {

      version = "8.4.0beta3";

      version = "8.4.0RC3";

      phpSrc = fetchurl {

        url = "https://downloads.php.net/~calvinb/php-8.4.0beta3.tar.xz";

        hash = "sha256-aTgUCmS3tdV304Ag05DZObLKTQ8XgpNIfHARbhpZUAw=";

        url = "https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz";

        hash = "sha256-6eA5w7NRfH5k+AyoIvuSEY9JgjtQqYwyZXTRSuKHBvY=";

      };

    }

  );

pkgs/development/interpreters/php/fix-paths-php84.patch

+9 −8
Original line number Diff line number Diff line
@@ -13,15 +13,16 @@ index e46acf0928..ee8e5a88f8 100644 
 

   AS_VAR_IF([GETTEXT_DIR],,

     [AC_MSG_ERROR([Cannot locate header file libintl.h])])

diff -ru a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4

--- a/sapi/apache2handler/config.m4	2018-11-07 15:35:23.000000000 +0000

+++ b/sapi/apache2handler/config.m4	2018-11-27 00:32:28.000000000 +0000

@@ -66,7 +66,7 @@

     AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])

   fi

diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4

index e335721f19..a5087e1320 100644

--- a/sapi/apache2handler/config.m4

+++ b/sapi/apache2handler/config.m4

@@ -68,7 +68,7 @@ if test "$PHP_APXS2" != "no"; then

   AS_VERSION_COMPARE([$APACHE_VERSION], [2.4.0],

     [AC_MSG_ERROR([Please note that Apache version >= 2.4 is required])])

 

-  APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`

-  APXS_LIBEXECDIR='$(INSTALL_ROOT)'$($APXS -q LIBEXECDIR)

+  APXS_LIBEXECDIR="$prefix/modules"

   if test -z `$APXS -q SYSCONFDIR`; then

   if test -z $($APXS -q SYSCONFDIR); then

     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \

                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \