alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
nixpkgs/pkgs/development/interpreters/php/fix-paths-php7.patch

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

27 lines
1.1 KiB
Diff
Raw Normal View History

php: align Darwin and Linux versions again Instead of pinning Darwin to older versions, add small patches to configure.in (7.1) / configure.ac (7.2) to fix the build of the intl extension on recent PHP versions on Darwin. fix-paths-php7.patch also required changes -- since we now run autoconf at build time (through ./buildconf), it needs to patch the input .m4 files instead of ./configure directly.
2018-11-27 00:39:20 +00:00
diff -ru a/ext/gettext/config.m4 b/ext/gettext/config.m4
--- a/ext/gettext/config.m4 2018-11-07 15:35:26.000000000 +0000
+++ b/ext/gettext/config.m4 2018-11-27 00:33:07.000000000 +0000
@@ -6,9 +6,7 @@
[ --with-gettext[=DIR] Include GNU gettext support])
php70: init at 7.0beta1 The first beta of php7 has been released. This enables developers to test their code for breakage in preparation for the stable release and allows us to make sure we don't have any bugs in the packaging prior to the stable release.
2015-07-17 17:33:49 +01:00
if test "$PHP_GETTEXT" != "no"; then
- for i in $PHP_GETTEXT /usr/local /usr; do
- test -r $i/include/libintl.h && GETTEXT_DIR=$i && break
- done
+ GETTEXT_DIR=$PHP_GETTEXT
if test -z "$GETTEXT_DIR"; then
php: align Darwin and Linux versions again Instead of pinning Darwin to older versions, add small patches to configure.in (7.1) / configure.ac (7.2) to fix the build of the intl extension on recent PHP versions on Darwin. fix-paths-php7.patch also required changes -- since we now run autoconf at build time (through ./buildconf), it needs to patch the input .m4 files instead of ./configure directly.
2018-11-27 00:39:20 +00:00
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
- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+ APXS_LIBEXECDIR="$prefix/modules"
if test -z `$APXS -q SYSCONFDIR`; then
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
Copy permalink