diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-24 06:29:09 +0000 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-24 06:29:09 +0000 |
| commit | bde20f3e881049c9d019eb34c07d6194b20b0042 (patch) | |
| tree | f24782e55ca68a214d0fe7585097d97a6aa687dd /pkgs/development/interpreters/php/fix-5.4.patch | |
| parent | 6a29a56c1277d80aa65e063f34a179c847e6d8b4 (diff) | |
| parent | 50d66b945ee5aceae2bbf2eb791487e18ac9d374 (diff) | |
| download | nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.tar nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.gz nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.bz2 nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.lz nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.xz nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.tar.zst nixlib-bde20f3e881049c9d019eb34c07d6194b20b0042.zip | |
Merge branch 'master' into x-updates
Conflicts (just taken x-updates): pkgs/servers/x11/xorg/overrides.nix
Diffstat (limited to 'pkgs/development/interpreters/php/fix-5.4.patch')
| -rw-r--r-- | pkgs/development/interpreters/php/fix-5.4.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/php/fix-5.4.patch b/pkgs/development/interpreters/php/fix-5.4.patch new file mode 100644 index 000000000000..51d98549eee2 --- /dev/null +++ b/pkgs/development/interpreters/php/fix-5.4.patch @@ -0,0 +1,68 @@ +diff -ru php-5.4.14/configure php-5.4.14-new/configure +--- php-5.4.14/configure 2013-04-10 09:53:26.000000000 +0200 ++++ php-5.4.14-new/configure 2013-04-22 17:13:55.039043622 +0200 +@@ -6513,7 +6513,7 @@ + + case $host_alias in + *aix*) +- APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR` ++ APXS_LIBEXECDIR="$prefix/modules" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" + PHP_AIX_LDFLAGS="-Wl,-brtl" + build_type=shared +@@ -6706,7 +6706,7 @@ + if test "$?" != "0"; then + APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option + else +- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` ++ APXS_LIBEXECDIR="$prefix/modules" + if test -z `$APXS -q SYSCONFDIR`; then + APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ +@@ -7909,7 +7909,7 @@ + { (exit 1); exit 1; }; } + 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' \ +@@ -8779,7 +8779,7 @@ + { (exit 1); exit 1; }; } + 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' \ +@@ -9634,7 +9634,7 @@ + + case $host_alias in + *aix*) +- APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR` ++ APXS_LIBEXECDIR="$prefix/modules" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" + PHP_AIX_LDFLAGS="-Wl,-brtl" + build_type=shared +@@ -9827,7 +9827,7 @@ + if test "$?" != "0"; then + APACHE_HOOKS_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option + else +- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` ++ APXS_LIBEXECDIR="$prefix/modules" + if test -z `$APXS -q SYSCONFDIR`; then + APACHE_HOOKS_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ +@@ -59657,9 +59657,7 @@ + + + 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 + { { $as_echo "$as_me:$LINENO: error: Cannot locate header file libintl.h" >&5 |