[packages/glibc] - added cet bcond

qboosh qboosh at pld-linux.org
Wed Aug 29 20:35:31 CEST 2018


commit a8a52a51a20725d841a6b888aa065568a2cf9526
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Aug 29 20:37:54 2018 +0200

    - added cet bcond

 glibc.spec | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
---
diff --git a/glibc.spec b/glibc.spec
index eff38f3..fea743b 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -16,6 +16,7 @@
 %bcond_with	cross		# make a cross build, skip native programs
 %bcond_without	nss_crypt	# disable crypt features based on Mozilla NSS library
 %bcond_with	bash_nls	# use bash NLS in shell scripts (ldd, sotruss); restores /bin/bash dep
+%bcond_without	cet		# Intel Control-flow Enforcement Technology (CET)
 #
 %ifarch %{ix86} %{x8664}
 %{!?min_kernel:%global		min_kernel	3.2.0}
@@ -26,6 +27,9 @@
 %ifarch sparc64
 %undefine	with_memusage
 %endif
+%ifnarch i686 %{x8664} x32
+%undefine	with_cet
+%endif
 
 %define		core_version	2.28
 %define		llh_version	7:2.6.32.1-1
@@ -98,7 +102,11 @@ BuildRequires:	binutils >= 2:2.29
 BuildRequires:	bison >= 2.7
 %{!?with_cross:BuildRequires:	dietlibc-static}
 BuildRequires:	gawk
+%if %{with cet}
 BuildRequires:	gcc >= 6:8.0
+%else
+BuildRequires:	gcc >= 6:4.7
+%endif
 %{?with_memusage:BuildRequires:	gd-devel >= 2.0.1}
 BuildRequires:	gettext-tools >= 0.10.36
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.18}
@@ -1010,7 +1018,7 @@ PATH=$(pwd)/alt-tools:$PATH; export PATH
 
 AWK="gawk" \
 ../%configure \
-%ifarch %{x8664} i686 x32
+%if %{with cet}
 	--enable-cet \
 %endif
 	--enable-bind-now \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/glibc.git/commitdiff/a8a52a51a20725d841a6b888aa065568a2cf9526



More information about the pld-cvs-commit mailing list