projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to gnumeric-1.12.18 and goffice-0.10.18
[hvlinux.git]
/
stage5
/
pkg
/
php
diff --git
a/stage5/pkg/php
b/stage5/pkg/php
index
0c0fed3
..
083a13f
100644
(file)
--- a/
stage5/pkg/php
+++ b/
stage5/pkg/php
@@
-11,11
+11,14
@@
hvconfig_pre()
# --mandir:
# If not specified, php installs some man pages under /usr/php
# (phpize.1, php.1 and php-config.1)
# --mandir:
# If not specified, php installs some man pages under /usr/php
# (phpize.1, php.1 and php-config.1)
- CONFIGURE_OPTS=" \
- ${CONFIGURE_OPTS} \
- --with-apxs2 \
- --with-config-file-path=/etc \
+ CONFIGURE_OPTS+=" \
+ --localstatedir=/var \
+ --datadir=/usr/share/php \
--mandir=/usr/share/man \
--mandir=/usr/share/man \
+ --with-config-file-path=/etc \
+ --enable-fpm \
+ --with-fpm-user=${HTTPD_USER} \
+ --with-fpm-group=${HTTPD_USER} \
--with-zlib \
--enable-bcmath \
--with-bz2 \
--with-zlib \
--enable-bcmath \
--with-bz2 \
@@
-27,6
+30,7
@@
hvconfig_pre()
--with-gettext \
--enable-mbstring \
--with-readline \
--with-gettext \
--enable-mbstring \
--with-readline \
+ --with-apxs2 \
--with-mysql=/usr \
--with-openssl=/usr \
--with-gd \
--with-mysql=/usr \
--with-openssl=/usr \
--with-gd \
@@
-45,7
+49,7
@@
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-production /etc/php.ini
+ cp ${
SRC_DIR
}/php.ini-production /etc/php.ini
if [ "x${USE_HTTPD}" = "xyes" ]; then
# To enable PHP support in the Apache web server, a new AddType
if [ "x${USE_HTTPD}" = "xyes" ]; then
# To enable PHP support in the Apache web server, a new AddType