SPECS: apr.spec - enable epoll, sendfile64, tcpnodelaycork for Th

arekm arekm at pld-linux.org
Sun Apr 23 22:36:28 CEST 2006


Author: arekm                        Date: Sun Apr 23 20:36:28 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- enable epoll, sendfile64, tcpnodelaycork for Th

---- Files affected:
SPECS:
   apr.spec (1.47 -> 1.48) 

---- Diffs:

================================================================
Index: SPECS/apr.spec
diff -u SPECS/apr.spec:1.47 SPECS/apr.spec:1.48
--- SPECS/apr.spec:1.47	Mon Apr 17 03:08:30 2006
+++ SPECS/apr.spec	Sun Apr 23 22:36:23 2006
@@ -1,15 +1,12 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	epoll		# don't use epoll() syscall (requires Linux 2.6)
-%bcond_without	sendfile64	# don't use sendfile64 (requires Linux 2.6 on ppc/sparc*)
-%bcond_without	tcpnodelaycork	# don't 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
 Version:	1.2.7
-Release:	1
+Release:	2
 Epoch:		1
 License:	Apache v2.0
 Group:		Libraries
@@ -17,8 +14,7 @@
 # Source0-md5:	e77887dbafc515c63feac84686bcb3bc
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-metuxmpm.patch
-Patch2:		%{name}-no-epoll.patch
-Patch3:		%{name}-libtool.patch
+Patch2:		%{name}-libtool.patch
 URL:		http://apr.apache.org/
 BuildRequires:	autoconf >= 2.13
 BuildRequires:	automake
@@ -26,10 +22,8 @@
 BuildRequires:	libuuid-devel
 BuildRequires:	sed >= 4.0
 BuildRequires:	python
-%if %{with epoll} || %{with sendfile64} || %{with tcpnodelaycork}
 Conflicts:	kernel24
 Conflicts:	kernel24-smp
-%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_includedir	/usr/include/apr
@@ -87,15 +81,12 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%{!?with_epoll:%patch2 -p1}
-%patch3 -p1
+%patch2 -p1
 
 %build
 install /usr/share/automake/config.* build
 ./buildconf
 %configure \
-	%{!?with_tcpnodelaycork:apr_cv_tcp_nodelay_with_cork=no} \
-	%{!?with_sendfile64:ac_cv_func_sendfile64=no} \
 	--with-devrandom=/dev/urandom \
 %ifarch %{ix86} %{i8664}
 %ifnarch i386
@@ -166,6 +157,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48  2006/04/23 20:36:23  arekm
+- enable epoll, sendfile64, tcpnodelaycork for Th
+
 Revision 1.47  2006/04/17 01:08:30  qboosh
 - updated to 1.2.7
 - switched bcond defaults after Ac branching (Linux >= 2.6 required now)
================================================================

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



More information about the pld-cvs-commit mailing list