SPECS: apr.spec - bcond descs

qboosh qboosh at pld-linux.org
Tue Nov 8 20:18:47 CET 2005


Author: qboosh                       Date: Tue Nov  8 19:18:47 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- bcond descs

---- Files affected:
SPECS:
   apr.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: SPECS/apr.spec
diff -u SPECS/apr.spec:1.40 SPECS/apr.spec:1.41
--- SPECS/apr.spec:1.40	Sat Nov  5 23:18:31 2005
+++ SPECS/apr.spec	Tue Nov  8 20:18:41 2005
@@ -1,6 +1,9 @@
 # $Revision$, $Date$
-%bcond_with	epoll
-%bcond_with	tcpnodelaycork
+#
+# Conditional build (Linux 2.4 compat, switch after Ac):
+%bcond_with	epoll		# use epoll() syscall (requires Linux 2.6)
+%bcond_with	tcpnodelaycork	# use TCP_NODELAY|TCP_CORK flags (requires Linux 2.6)
+#
 Summary:	Apache Portable Runtime
 Summary(pl):	Apache Portable Runtime - przenośna biblioteka uruchomieniowa
 Name:		apr
@@ -13,7 +16,6 @@
 # Source0-md5:	c43d923b02cf1983106d694976be89c1
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-metuxmpm.patch
-# EPOLL PATCH: TO BE DROPPED AFTER AC
 Patch2:		%{name}-no-epoll.patch
 URL:		http://apr.apache.org/
 BuildRequires:	autoconf >= 2.13
@@ -84,7 +86,6 @@
 %build
 install /usr/share/automake/config.* build
 ./buildconf
-# disable TCP_NODELAY|TCP_CORK for 2.4.x compatibility (to be dropped after Ac)
 # 2.4/2.6 kernels on sparc32 do not support sendfile64
 %configure \
 	%{!?with_tcpnodelaycork:apr_cv_tcp_nodelay_with_cork=no} \
@@ -158,6 +159,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2005/11/08 19:18:41  qboosh
+- bcond descs
+
 Revision 1.40  2005/11/05 22:18:31  arekm
 - epoll, tcpnodelaycork bconds; --enable-nonportable-atomics on amd64; FYI: disabling funcionality due to kernel24 crap sucks
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apr.spec?r1=1.40&r2=1.41&f=u




More information about the pld-cvs-commit mailing list