SPECS (DEVEL): php.spec - -threads-acfix.patch problem seems gone

[glen]

Author: glen                         Date: Tue Oct 23 06:25:43 2007 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- -threads-acfix.patch problem seems gone

---- Files affected:
SPECS:
   php.spec (1.688.2.2 -> 1.688.2.3) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.688.2.2 SPECS/php.spec:1.688.2.3
--- SPECS/php.spec:1.688.2.2	Tue Oct 23 00:31:59 2007
+++ SPECS/php.spec	Tue Oct 23 08:25:38 2007
@@ -74,7 +74,7 @@
 %undefine	with_filter
 %endif
 
-%define	_rel	0.1
+%define	_rel	0.2
 %define	_snap	200710222030
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
@@ -111,7 +111,6 @@
 Patch8:		%{name}-no-metaccld.patch
 Patch9:		%{name}-sh.patch
 Patch10:	%{name}-ini.patch
-#Patch11:	%{name}-acam.patch
 # XXX: needs fix
 Patch12:	%{name}-threads-acfix.patch
 Patch13:	%{name}-tsrmlsfetchgcc2.patch
@@ -1571,10 +1570,7 @@
 
 cp php.ini-dist php.ini
 %patch10 -p1
-# for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked
-# conditionally...
-#%patch11 -p1 # CHECKME
-#%patch12 -p1 # breaks with ac cache vars, but later -lpthread is missing ...
+%patch12 -p1
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
@@ -1592,7 +1588,6 @@
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
-
 %{?with_versioning:%patch26 -p1}
 
 %patch28 -p1
@@ -1807,7 +1802,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}
@@ -1817,18 +1812,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
@@ -2733,6 +2728,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.688.2.3  2007/10/23 06:25:38  glen
+- -threads-acfix.patch problem seems gone
+
 Revision 1.688.2.2  2007/10/22 22:31:59  glen
 - snap in release
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.688.2.2&r2=1.688.2.3&f=u