SPECS (AC-branch): php.spec - builds with hacks

[glen]

Author: glen                         Date: Mon Feb 12 09:26:28 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- builds with hacks

---- Files affected:
SPECS:
   php.spec (1.631.2.14 -> 1.631.2.15) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.631.2.14 SPECS/php.spec:1.631.2.15
--- SPECS/php.spec:1.631.2.14	Fri Feb  9 10:34:48 2007
+++ SPECS/php.spec	Mon Feb 12 10:26:21 2007
@@ -1,22 +1,6 @@
 # $Revision$, $Date$
-# TODO:
-
-Configuring TSRM
-checking for i686-pld-linux-ranlib... no
-checking for ranlib... ranlib
-checking for stdarg.h... (cached) yes
-checking for pthreads_cflags... (cached) -pthread
-checking for pthreads_lib... (cached) pthread
-configure: error: Your system seems to lack POSIX threads.
-error: Bad exit status from /var/tmp/rpm-tmp.2373 (%build)
-
-
-RPM build errors:
-    Bad exit status from /var/tmp/rpm-tmp.2373 (%build)
-
-shell returned 1
-
-
+# TODO
+# - fix -threads-acfix.patch
 # - deal with modules removed from php and not moved to PECL, still not obsoleted anywhere
 #   - removed from php 5.0 (currently in php4):
 #   db, hyperwave, java, mcal, overload, qtdom
@@ -77,7 +61,7 @@
 %undefine	with_interbase
 %endif
 
-%if !%{with apache1} && !%{with apache2}
+%if %{without apache1} && %{without apache2}
 ERROR: You need to select at least one Apache SAPI to build shared modules.
 %endif
 
@@ -123,7 +107,7 @@
 Patch9:		%{name}-sh.patch
 Patch10:	%{name}-ini.patch
 Patch11:	%{name}-acam.patch
-Patch15:	%{name}-threads-acfix.patch
+#Patch15:	%{name}-threads-acfix.patch
 Patch16:	%{name}-tsrmlsfetchgcc2.patch
 Patch17:	%{name}-no_pear_install.patch
 Patch18:	%{name}-zlib.patch
@@ -177,7 +161,7 @@
 BuildRequires:	libxml2-devel >= 2.5.10
 BuildRequires:	libxslt-devel >= 1.1.0
 %{?with_mhash:BuildRequires:	mhash-devel}
-%{?with_ming:BuildRequires:	ming-devel >= 0.2a-11}
+%{?with_ming:BuildRequires:	ming-devel >= 0.3}
 %{?with_mm:BuildRequires:	mm-devel >= 1.3.0}
 BuildRequires:	mysql-devel >= 4.0.0
 %{?with_mysqli:BuildRequires:	mysql-devel >= 4.1.0}
@@ -1574,7 +1558,7 @@
 # for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked
 # conditionally...
 %patch11 -p1
-%patch15 -p1
+#%patch15 -p1 # breaks with ac cache vars, but later -lpthread is missing ...
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
@@ -1817,18 +1801,18 @@
 # FCGI
 %if %{with fcgi}
 cp -af php_config.h.fcgi main/php_config.h
-%{__make} sapi/cgi/php -f Makefile.fcgi
+%{__make} sapi/cgi/php -f Makefile.fcgi LDFLAGS=-lpthread
 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 -f Makefile.cgi
+%{__make} sapi/cgi/php -f Makefile.cgi LDFLAGS=-lpthread
 
 # CLI
 cp -af php_config.h.cli main/php_config.h
-%{__make} sapi/cli/php -f Makefile.cli
+%{__make} sapi/cli/php -f Makefile.cli LDFLAGS=-lpthread
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -2733,6 +2717,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.631.2.15  2007/02/12 09:26:21  glen
+- builds with hacks
+
 Revision 1.631.2.14  2007/02/09 09:34:48  glen
 - 5.2.1, but threading libs not found
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php.spec?r1=1.631.2.14&r2=1.631.2.15&f=u