|
php.net | support | documentation | report a bug | advanced search | search howto | statistics | random bug | login |
[2004-06-29 15:51 UTC] Joerg dot Dieter dot Friedrich at uni-konstanz dot de
Description:
------------
It would be really great if apxs would not be called with '-a' when INSTALL_ROOT is set.
This would make package building easier.
this is a patch to sapi/apache/config.m4 which I think it must fix it. But please proove-read it.
--- sapi/apache/config.m4.orig Tue Jun 29 15:44:21 2004
+++ sapi/apache/config.m4 Tue Jun 29 15:48:26 2004
@@ -70,9 +70,16 @@
# Test whether apxs support -S option
$APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
+
+ # Test whether INSTALL_ROOT is set
+ ifeq ($(strip $(INSTALL_ROOT)),)
+ APXS_ACTIVATE="-a"
+ else
+ APXS_ACTIVATE="-a"
+ endif
if test "$?" != "0"; then
- APACHE_INSTALL="$APXS -i -a -n php4 $SAPI_SHARED" # Old apxs does not have -S option
+ APACHE_INSTALL="$APXS -i $APXS_ACTIVATE -n php4 $SAPI_SHARED" # Old apxs does not have -S option
else
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
if test -z `$APXS -q SYSCONFDIR`; then
@@ -85,7 +92,7 @@
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
- -i -a -n php4 $SAPI_SHARED"
+ -i $APXS_ACTIVATE -n php4 $SAPI_SHARED"
fi
fi
PatchesPull RequestsHistoryAllCommentsChangesGit/SVN commits
|
|||||||||||||||||||||||||||||||||||||
Copyright © 2001-2025 The PHP GroupAll rights reserved. |
Last updated: Sat Oct 25 07:00:02 2025 UTC |
oops, typo in patch: --- sapi/apache/config.m4.orig Tue Jun 29 15:44:21 2004 +++ sapi/apache/config.m4 Tue Jun 29 15:52:54 2004 @@ -70,9 +70,16 @@ # Test whether apxs support -S option $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1 + + # Test whether INSTALL_ROOT is set + ifeq ($(strip $(INSTALL_ROOT)),) + APXS_ACTIVATE="-a" + else + APXS_ACTIVATE="" + endif if test "$?" != "0"; then - APACHE_INSTALL="$APXS -i -a -n php4 $SAPI_SHARED" # Old apxs does not have -S option + APACHE_INSTALL="$APXS -i $APXS_ACTIVATE -n php4 $SAPI_SHARED" # Old apxs does not have -S option else APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` if test -z `$APXS -q SYSCONFDIR`; then @@ -85,7 +92,7 @@ \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ -S SYSCONFDIR='$APXS_SYSCONFDIR' \ - -i -a -n php4 $SAPI_SHARED" + -i $APXS_ACTIVATE -n php4 $SAPI_SHARED" fi fiI have been trying to figure out how to get information into Makefile so that looking at the value of INSTALL_ROOT is determined at 'make install' time. The following logic is run either at buildconf, or configure time (does this mean INSTALL_ROOT needs to be defined BEFORE running ./configure??) because it seems the outoput is always coming from the 'else' block if test -z `$APXS -q SYSCONFDIR`; then INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ -i -n php5" else APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ -S SYSCONFDIR='$APXS_SYSCONFDIR' \ -i -a -n php5" fi as the -a option is hard coded as the only statement in MakefileI did some testing and cannot get the ifeq to work, what does work is this change in Makefile.global (for version 5.3.20 +) --- Makefile.global.distr 2012-12-19 16:13:48.000000000 +0100 +++ Makefile.global 2012-12-28 13:57:48.000000000 +0100 @@ -33,6 +33,11 @@ fi; \ done; \ fi + @if [ -z $(strip $(INSTALL_ROOT)) ]; then \ + APXS_ACTIVATE="-a" ; \ + else \ + APXS_ACTIVATE="" ; \ + fi @$(INSTALL_IT) install-modules: build-modules I have not been able to find the file that creates the INSTALL_IT definition for Makefile. I thought it would be sapi/apache2handler/config.m4 but any (or where) I make changes are not applied by the ./configure process. I switch -a for $(APXS_ACTIVATE) so it reads: INSTALL_IT = $(mkinstalldirs) '$(INSTALL_ROOT)/opt/httpd/libexec' && $(mkinstalldirs) '$(INSTALL_ROOT)/var/httpd/etc' && /opt/httpd/sbin/apxs -S LIBEXECDIR='$(INSTALL_ROOT)/opt/httpd/libexec' -S SYSCONFDIR='$(INSTALL_ROOT)/var/httpd/etc' -i $(APXS_ACTIVATE) -n php5 libphp5.la /var/http/etc, /opt/httpd/sbin, etc, are coming from the configure inputs of course.