From 6e134fd0a5978ee9eb5a6caef2cede4d822ae59e Mon Sep 17 00:00:00 2001
From: Yang Yanchao <yangyanchao6@huawei.com>
Date: Fri, 21 Jan 2022 09:17:17 +0800
Subject: [PATCH] disable check-installed-headers-c and
 check-installed-headers-cxx and delete glibc-benchtest to improve build speed

Signed-off-by: Yang Yanchao <yangyanchao6@huawei.com>
---
 ...talled-headers-c-and-check-installed.patch | 60 +++++++++++++++++++
 glibc.spec                                    |  9 ++-
 2 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 delete-check-installed-headers-c-and-check-installed.patch

diff --git a/delete-check-installed-headers-c-and-check-installed.patch b/delete-check-installed-headers-c-and-check-installed.patch
new file mode 100644
index 0000000..b4fa934
--- /dev/null
+++ b/delete-check-installed-headers-c-and-check-installed.patch
@@ -0,0 +1,60 @@
+From dd2efa50d197e2205acd8edbf29aba717d71bdbb Mon Sep 17 00:00:00 2001
+From: Yang Yanchao <yangyanchao6@huawei.com>
+Date: Tue, 4 Jan 2022 19:55:28 +0800
+Subject: [PATCH] testsuit: delete check-installed-headers-c and check-installed-headers-cxx
+
+check-installed-headers-c and check-installed-headers-cxx checked at CI
+and can be deleted during building
+
+---
+ Makefile | 4 ++--
+ Rules    | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f98d5a9e..83200a75 100644
+--- a/Makefile
++++ b/Makefile
+@@ -532,7 +532,7 @@ $(objpfx)check-local-headers.out: scripts/check-local-headers.sh
+ 
+ ifneq "$(headers)" ""
+ # Special test of all the installed headers in this directory.
+-tests-special += $(objpfx)check-installed-headers-c.out
++# tests-special += $(objpfx)check-installed-headers-c.out
+ libof-check-installed-headers-c := testsuite
+ $(objpfx)check-installed-headers-c.out: \
+     scripts/check-installed-headers.sh $(headers)
+@@ -542,7 +541,7 @@ $(objpfx)check-installed-headers-c.out: \
+ 	$(evaluate-test)
+ 
+ ifneq "$(CXX)" ""
+-tests-special += $(objpfx)check-installed-headers-cxx.out
++# tests-special += $(objpfx)check-installed-headers-cxx.out
+ libof-check-installed-headers-cxx := testsuite
+ $(objpfx)check-installed-headers-cxx.out: \
+     scripts/check-installed-headers.sh $(headers)
+diff --git a/Rules b/Rules
+index b1137afe..ca29abd7 100644
+--- a/Rules
++++ b/Rules
+@@ -84,7 +84,7 @@ common-generated += dummy.o dummy.c
+ ifneq "$(headers)" ""
+ # Test that all of the headers installed by this directory can be compiled
+ # in isolation.
+-tests-special += $(objpfx)check-installed-headers-c.out
++# tests-special += $(objpfx)check-installed-headers-c.out
+ libof-check-installed-headers-c := testsuite
+ $(objpfx)check-installed-headers-c.out: \
+     $(..)scripts/check-installed-headers.sh $(headers)
+@@ -96,7 +95,7 @@ $(objpfx)check-installed-headers-c.out: \
+ ifneq "$(CXX)" ""
+ # If a C++ compiler is available, also test that they can be compiled
+ # in isolation as C++.
+-tests-special += $(objpfx)check-installed-headers-cxx.out
++# tests-special += $(objpfx)check-installed-headers-cxx.out
+ libof-check-installed-headers-cxx := testsuite
+ $(objpfx)check-installed-headers-cxx.out: \
+     $(..)scripts/check-installed-headers.sh $(headers)
+-- 
+2.27.0
+
diff --git a/glibc.spec b/glibc.spec
index 3527254..3cbe88b 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -28,7 +28,7 @@
 #  - Default: Always run valgrind tests if there is architecture support.
 ##############################################################################
 %bcond_without testsuite
-%bcond_without benchtests
+%bcond_with benchtests
 %bcond_with bootstrap
 %bcond_with werror
 %bcond_without docs
@@ -66,7 +66,7 @@
 ##############################################################################
 Name: 	 	glibc
 Version: 	2.34
-Release: 	44
+Release: 	45
 Summary: 	The GNU libc libraries
 License:	%{all_license}
 URL: 		http://www.gnu.org/software/glibc/
@@ -176,6 +176,7 @@ Patch9007: 0006-add-elsion-function-which-moved-to-libc-in-glibc-2.34.patch
 Patch9008: 0007-add-lowlevellock_2_17_c.patch
 Patch9009: 0008-add-pause_nocancel_2_17.patch
 Patch9010: 0009-add-unwind-with-longjmp.patch
+Patch9011: delete-check-installed-headers-c-and-check-installed.patch
 
 Provides: ldconfig rtld(GNU_HASH) bundled(gnulib)
 
@@ -1366,6 +1367,10 @@ fi
 %endif
 
 %changelog
+* Fri Jan 21 Yang Yanchao<yangyanchao6@huawei.com> - 2.34-45
+- disable check-installed-headers-c and check-installed-headers-cxx
+  and delete glibc-benchtest to improve build speed
+
 * Fri Jan 21 Qingqing Li <liqingqing3@huawei.com> - 2.34-44
 - support: Add check for TID zero in support_wait_for_thread_exit