SPECS (AC-branch): glibc.spec - pax hack as bcond (some people use...

[kosmo]

Author: kosmo                        Date: Tue Aug 30 08:11:19 2005 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- pax hack as bcond (some people use it)

---- Files affected:
SPECS:
   glibc.spec (1.583.2.25 -> 1.583.2.26) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.583.2.25 SPECS/glibc.spec:1.583.2.26
--- SPECS/glibc.spec:1.583.2.25	Fri Aug 19 13:22:08 2005
+++ SPECS/glibc.spec	Tue Aug 30 10:11:14 2005
@@ -17,6 +17,7 @@
 %bcond_with	tests_nptl	# perform NPTL tests on dual build (requires 2.6.x kernel)
 %bcond_without	localedb	# don't build localedb-all (is time consuming)
 %bcond_with	cross		# build using crossgcc (without libgcc_eh)
+%bcond_with	pax		# apply PaX patches
 #
 # TODO:
 # - look at locale fixes/updates in bugzilla
@@ -127,8 +128,7 @@
 Patch27:	%{name}-execvp.patch
 Patch28:	%{name}-sys-kd.patch
 Patch29:	%{name}-cross-gcc_eh.patch
-# PaX hack (dropped)
-#PatchX:	%{name}-pax_dl-execstack.patch
+Patch30:	%{name}-pax_dl-execstack.patch
 URL:		http://www.gnu.org/software/libc/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -885,6 +885,7 @@
 %patch27 -p1
 %patch28 -p1
 %{?with_cross:%patch29 -p1}
+%{?with_pax:%patch30 -p1}
 
 chmod +x scripts/cpp
 
@@ -1607,6 +1608,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.583.2.26  2005/08/30 08:11:14  kosmo
+- pax hack as bcond (some people use it)
+
 Revision 1.583.2.25  2005/08/19 11:22:08  baggins
 - release 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/glibc.spec?r1=1.583.2.25&r2=1.583.2.26&f=u