mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 01:43:15 +00:00
svn path=/nixpkgs/trunk/; revision=9598
This commit is contained in:
parent
7d06914cf4
commit
742ae36bf1
56
pkgs/development/interpreters/php_configurable/fix.patch
Normal file
56
pkgs/development/interpreters/php_configurable/fix.patch
Normal file
@ -0,0 +1,56 @@
|
||||
--- php-5.0.4/configure 2005-04-03 11:42:50.000000000 +0200
|
||||
+++ php-5.0.4-1/configure 2005-07-10 11:06:22.292271176 +0200
|
||||
@@ -3381,7 +3381,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
|
||||
@@ -3576,7 +3576,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' \
|
||||
@@ -4680,7 +4680,7 @@
|
||||
{ echo "configure: error: Please note that Apache version >= 2.0.40 is required." 1>&2; 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' \
|
||||
@@ -5510,7 +5510,7 @@
|
||||
{ echo "configure: error: Please note that Apache version >= 2.0.44 is required." 1>&2; 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' \
|
||||
@@ -6327,7 +6327,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
|
||||
@@ -6522,7 +6522,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' \
|
Loading…
Reference in New Issue
Block a user