Author: glen Date: Wed Oct 31 13:27:25 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- pthread hack not needed
- catch errors from subshell
---- Files affected:
SPECS:
php.spec (1.689 -> 1.690)
---- Diffs:
================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.689 SPECS/php.spec:1.690
--- SPECS/php.spec:1.689 Tue Oct 30 21:24:16 2007
+++ SPECS/php.spec Wed Oct 31 14:27:20 2007
@@ -13,6 +13,7 @@
# - make additional headers and checking added by mail patch configurable
# - apply -hardened patch by default ?
# - modularize session, standard (output from pure php -m)?
+# - XXX php-fcgi thinks it is cgi api!!!!! XXXX
#
# Conditional build:
%bcond_with fdf # with FDF (PDF forms) module (BR:
proprietary lib)
@@ -72,7 +73,7 @@
%undefine with_filter
%endif
-%define _rel 0.1
+%define _rel 0.2
%define _rc RC1
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
@@ -1573,7 +1574,7 @@
# for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked
# conditionally...
%patch11 -p1
-#%patch12 -p1 # breaks with ac cache vars, but later -lpthread is missing ...
+%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
@@ -1655,30 +1656,32 @@
%endif
"
for sapi in $sapis; do
+ : SAPI $sapi
[ -f Makefile.$sapi ] && continue # skip if already configured (for
faster debugging purposes)
- %configure \
- `
+ sapi_args=''
case $sapi in
cgi)
- echo --enable-discard-path --enable-force-cgi-redirect
- ;;
+ sapi_args='--enable-discard-path --enable-force-cgi-redirect'
+ ;;
cli)
- echo --disable-cgi
- ;;
+ sapi_args='--disable-cgi'
+ ;;
fcgi)
- echo --enable-fastcgi --with-fastcgi=/usr
--enable-force-cgi-redirect
- ;;
+ sapi_args='--enable-fastcgi --with-fastcgi=/usr
--enable-force-cgi-redirect'
+ ;;
apxs1)
- ver=%(rpm -q --qf '%%{version}' apache1-apxs)
- echo --with-apxs=%{apxs1} --with-apache-version=$ver
- ;;
+ ver=$(rpm -q --qf '%{V}' apache1-devel)
+ sapi_args="--with-apxs=%{apxs1} --with-apache-version=$ver"
+ ;;
apxs2)
- ver=%(rpm -q --qf '%%{version}' apache-apxs)
- echo --with-apxs2=%{apxs2} --with-apache-version=$ver
- ;;
+ ver=$(rpm -q --qf '%{V}' apache-devel)
+ sapi_args="--with-apxs2=%{apxs2} --with-apache-version=$ver"
+ ;;
esac
- ` \
+
+ %configure \
+ $sapi_args \
%if "%{!?configure_cache:0}%{?configure_cache}" == "0"
--cache-file=config.cache \
%endif
@@ -1806,7 +1809,7 @@
%{__make} build-modules
%if %{with apache1}
-%{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache/libphp5.la -f Makefile.apxs1
LDFLAGS="-lpthread"
+%{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache/libphp5.la -f Makefile.apxs1
%endif
%if %{with apache2}
@@ -1816,18 +1819,18 @@
# FCGI
%if %{with fcgi}
cp -af php_config.h.fcgi main/php_config.h
-%{__make} sapi/cgi/php-cgi -f Makefile.fcgi LDFLAGS="-lpthread"
+%{__make} sapi/cgi/php-cgi -f Makefile.fcgi
cp -r sapi/cgi sapi/fcgi
rm -rf sapi/cgi/.libs sapi/cgi/*.lo
%endif
# CGI
cp -af php_config.h.cgi main/php_config.h
-%{__make} sapi/cgi/php-cgi -f Makefile.cgi LDFLAGS="-lpthread"
+%{__make} sapi/cgi/php-cgi -f Makefile.cgi
# CLI
cp -af php_config.h.cli main/php_config.h
-%{__make} sapi/cli/php -f Makefile.cli LDFLAGS="-lpthread"
+%{__make} sapi/cli/php -f Makefile.cli
%if %{with tests}
# Run tests, using the CLI SAPI
@@ -2732,6 +2735,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.690 2007/10/31 13:27:20 glen
+- pthread hack not needed
+- catch errors from subshell
+
Revision 1.689 2007/10/30 20:24:16 glen
- 5.2.5RC1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.689&r2=1.690&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
