projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace APACHE_USER by HTTPD_USER
[hvlinux.git]
/
stage5
/
pkg
/
php
diff --git
a/stage5/pkg/php
b/stage5/pkg/php
index
ad91548
..
5b34926
100644
(file)
--- a/
stage5/pkg/php
+++ b/
stage5/pkg/php
@@
-2,9
+2,6
@@
hvconfig_pre()
{
hvconfig_pre()
{
- sed -i 's/const char \*errpfx,/const DB_ENV *dbenv, & const/' \
- ${LFS_TMP}/${PACKAGE}/ext/dba/dba_db4.c
-
# Since PHP 5, you need to explicitly bundle PHP with MySQL by --with-mysql
# directive (make sure you specified path to where MySQL is installed on
# your system).
# Since PHP 5, you need to explicitly bundle PHP with MySQL by --with-mysql
# directive (make sure you specified path to where MySQL is installed on
# your system).
@@
-13,30
+10,30
@@
hvconfig_pre()
# gcc: Zend/zend_language_scanner.c: No such file or directory
CONFIGURE_OPTS=" \
${CONFIGURE_OPTS} \
# gcc: Zend/zend_language_scanner.c: No such file or directory
CONFIGURE_OPTS=" \
${CONFIGURE_OPTS} \
- --with-apxs2=/usr/sbin/apxs \
- --enable-force-cgi-redirect \
- --enable-discard-path \
+ --with-apxs2 \
--with-config-file-path=/etc \
--with-zlib \
--enable-bcmath \
--with-bz2 \
--with-config-file-path=/etc \
--with-zlib \
--enable-bcmath \
--with-bz2 \
- --with-gd \
- --with-freetype-dir=/usr \
- --with-t1lib \
- --enable-gd-native-ttf \
--enable-calendar \
--enable-calendar \
- --enable-dba \
- --enable-exif \
+ --enable-dba=shared \
+ --with-gdbm \
+ --with-gmp \
--enable-ftp \
--with-gettext \
--enable-mbstring \
--enable-ftp \
--with-gettext \
--enable-mbstring \
- --with-ncurses \
--with-readline \
--with-readline \
- --with-openssl=/usr \
- --with-ldap \
--with-mysql=/usr \
--with-mysql=/usr \
- --with-imap=/usr/lib/uw-imap \
- --with-imap-ssl=/usr/include/openssl"
+ --with-openssl=/usr \
+ --with-gd \
+ --with-freetype-dir=/usr \
+ --with-t1lib \
+ --enable-gd-native-ttf \
+ --enable-exif"
+
+# IMAP
+# --with-imap=/usr/lib/uw-imap \
+# --with-imap-ssl=/usr/include/openssl"
}
hvbuild_post()
}
hvbuild_post()
@@
-44,18
+41,19
@@
hvbuild_post()
if [ -f /etc/php.ini ]; then
cp /etc/php.ini /etc/php.ini.old
fi
if [ -f /etc/php.ini ]; then
cp /etc/php.ini /etc/php.ini.old
fi
- cp ${LFS_TMP}/${PACKAGE}/php.ini-
dist
/etc/php.ini
+ cp ${LFS_TMP}/${PACKAGE}/php.ini-
production
/etc/php.ini
# To enable PHP support in the Apache web server, a new AddType directive
# must be added to the httpd.conf file.
# To enable PHP support in the Apache web server, a new AddType directive
# must be added to the httpd.conf file.
- if ! grep "application/x-httpd-php" /etc/apache/httpd.conf \
- 1> /dev/null 2>&1; then
- echo "AddType application/x-httpd-php .php" >> /etc/apache/httpd.conf
+ if ! grep -q "application/x-httpd-php" /etc/httpd/httpd.conf; then
+ echo "AddType application/x-httpd-php .php" >> /etc/httpd/httpd.conf
fi
fi
- if ! grep "DirectoryIndex" /etc/apache/httpd.conf | grep "index.php" \
- 1> /dev/null 2>&1; then
- sed -i -e "s!\(^DirectoryIndex index.html.*\)!\1 index.php!g" \
- /etc/apache/httpd.conf
+ # Est-ce nécessaire?
+ #cgi.discard_path = 1
+
+ if ! grep -q "DirectoryIndex" /etc/httpd/httpd.conf | grep "index.php"; then
+ sed -i -e "s!\(^\s*DirectoryIndex index.html.*\)!\1 index.php!g" \
+ /etc/httpd/httpd.conf
fi
}
fi
}