From 4f6263d37ebb6f911b7511cbe033f3fbbc1251c4 Mon Sep 17 00:00:00 2001
From: "fuhua.wang" <wangallen323@gmail.com>
Date: Thu, 29 Jul 2021 13:08:57 +0800
Subject: [PATCH 1/5] =?UTF-8?q?[=E9=98=9F=E5=90=8D:=20=E5=A4=A7=E5=8A=9B?=
 =?UTF-8?q?=E5=87=BA=E5=A5=87=E8=BF=B9][=E9=A1=B9=E7=9B=AE:=20=E9=B2=B2?=
 =?UTF-8?q?=E9=B9=8F=E5=BA=94=E7=94=A8=E5=88=9B=E5=85=88=E5=A4=A7=E8=B5=9B?=
 =?UTF-8?q?openeuler-gnulib=E7=BC=96=E8=AF=91=E4=BC=98=E5=8C=96]=20[?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=E8=AF=B4=E6=98=8E=EF=BC=9A=E9=87=87=E7=94=A8?=
 =?UTF-8?q?numa=E7=BB=91=E6=A0=B8=E7=9A=84=E6=96=B9=E5=BC=8F=E5=B0=9D?=
 =?UTF-8?q?=E8=AF=95=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4]=20[=E6=96=B9=E6=A1=88=E9=A3=8E=E9=99=A9?=
 =?UTF-8?q?=EF=BC=9A=E5=BC=BA=E5=88=B6=E7=BB=91=E6=A0=B8=E7=9A=84=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=AF=E8=83=BD=E5=9C=A8=E5=B9=B6=E8=A1=8C=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E4=BC=9A=E5=AF=BC=E8=87=B4=E7=AD=89?=
 =?UTF-8?q?=E5=BE=85=EF=BC=8C=E5=87=BA=E7=8E=B0=E7=BC=96=E8=AF=91=E6=9B=B4?=
 =?UTF-8?q?=E9=95=BF=E7=9A=84=E6=97=B6=E9=97=B4]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gnulib.spec | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnulib.spec b/gnulib.spec
index ba5e7fc..3d11e9a 100644
--- a/gnulib.spec
+++ b/gnulib.spec
@@ -72,6 +72,13 @@ rm -rf */.cvsignore */.gitignore */.gitattributes lib/.cppi-disable lib/uniname/
 make -C build-tests check VERBOSE=1
 
 %install
+#采用numa绑核的方式尝试优化部分编译时间，可以cat cpuinfo和arch来进行兼容，由于此次比赛时间紧迫，且没有时间进行验证，暂且只保证编译通过。
+numactl -C 0 install -d %{buildroot}%{_datadir}/gnulib
+numactl -C 1 install -d %{buildroot}%{_bindir}
+numactl -C 2 install -d %{buildroot}%{_datadir}/info
+numactl -C 3 install -d %{buildroot}%{_docdir}/gnulib
+numactl -C 4 install -d %{buildroot}%{_mandir}/man1
+
 install -d %{buildroot}%{_datadir}/gnulib
 install -d %{buildroot}%{_bindir}
 install -d %{buildroot}%{_datadir}/info
-- 
Gitee


From 1f7c4746210c293e14113ef54168649d64fab7bf Mon Sep 17 00:00:00 2001
From: "fuhua.wang" <wangallen323@gmail.com>
Date: Thu, 29 Jul 2021 14:48:32 +0800
Subject: [PATCH 2/5] =?UTF-8?q?[=E9=98=9F=E5=90=8D:=20=E5=A4=A7=E5=8A=9B?=
 =?UTF-8?q?=E5=87=BA=E5=A5=87=E8=BF=B9][=E9=A1=B9=E7=9B=AE:=20=E9=B2=B2?=
 =?UTF-8?q?=E9=B9=8F=E5=BA=94=E7=94=A8=E5=88=9B=E5=85=88=E5=A4=A7=E8=B5=9B?=
 =?UTF-8?q?openeuler-gnulib=E7=BC=96=E8=AF=91=E4=BC=98=E5=8C=96]=20[?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=E8=AF=B4=E6=98=8E=EF=BC=9A=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?jenkins=E7=BC=96=E8=AF=91=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98]?=
 =?UTF-8?q?=20[=E6=96=B9=E6=A1=88=E9=A3=8E=E9=99=A9=EF=BC=9A=E6=97=A0]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gnulib.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnulib.spec b/gnulib.spec
index 3d11e9a..5315d50 100644
--- a/gnulib.spec
+++ b/gnulib.spec
@@ -1,6 +1,6 @@
 Name:             gnulib
 Version:          0
-Release:          28.20180720git
+Release:          29.20180720git
 Summary:          The GNU Portability Library
 License:          Public Domain and BSD and GPLv2+ and GPLv3 and GPLv3+ and LGPLv2 and LGPLv2+ and LGPLv3+
 URL:              https://www.gnu.org/software/gnulib
-- 
Gitee


From e3757b8318f469f84ac9ac9f3bddce6ae42ddbcc Mon Sep 17 00:00:00 2001
From: "fuhua.wang" <wangallen323@gmail.com>
Date: Fri, 30 Jul 2021 10:04:00 +0800
Subject: [PATCH 3/5] =?UTF-8?q?[=E9=98=9F=E5=90=8D:=20=E5=A4=A7=E5=8A=9B?=
 =?UTF-8?q?=E5=87=BA=E5=A5=87=E8=BF=B9][=E9=A1=B9=E7=9B=AE:=20=E9=B2=B2?=
 =?UTF-8?q?=E9=B9=8F=E5=BA=94=E7=94=A8=E5=88=9B=E5=85=88=E5=A4=A7=E8=B5=9B?=
 =?UTF-8?q?openeuler-gnulib=E7=BC=96=E8=AF=91=E4=BC=98=E5=8C=96]=20[?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=E8=AF=B4=E6=98=8E=EF=BC=9A=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?numa=E6=93=8D=E4=BD=9C=EF=BC=8C=E5=BC=80=E5=90=AFOpenMP?=
 =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E6=A0=B8=E7=BB=91=E5=AE=9A]=20[=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88=E9=A3=8E=E9=99=A9=EF=BC=9A=E6=97=A0]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gnulib.spec | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/gnulib.spec b/gnulib.spec
index 5315d50..d263508 100644
--- a/gnulib.spec
+++ b/gnulib.spec
@@ -72,13 +72,8 @@ rm -rf */.cvsignore */.gitignore */.gitattributes lib/.cppi-disable lib/uniname/
 make -C build-tests check VERBOSE=1
 
 %install
-#采用numa绑核的方式尝试优化部分编译时间，可以cat cpuinfo和arch来进行兼容，由于此次比赛时间紧迫，且没有时间进行验证，暂且只保证编译通过。
-numactl -C 0 install -d %{buildroot}%{_datadir}/gnulib
-numactl -C 1 install -d %{buildroot}%{_bindir}
-numactl -C 2 install -d %{buildroot}%{_datadir}/info
-numactl -C 3 install -d %{buildroot}%{_docdir}/gnulib
-numactl -C 4 install -d %{buildroot}%{_mandir}/man1
-
+#开启OpenMP线程核绑定，由于此次比赛时间紧迫，且没有时间进行验证，暂且只保证编译通过。
+export OMP_PROC_BIND=true
 install -d %{buildroot}%{_datadir}/gnulib
 install -d %{buildroot}%{_bindir}
 install -d %{buildroot}%{_datadir}/info
-- 
Gitee


From e3ab77ac1b5fe43f8b928f288bc321e4a498af15 Mon Sep 17 00:00:00 2001
From: "fuhua.wang" <wangallen323@gmail.com>
Date: Fri, 30 Jul 2021 15:31:25 +0800
Subject: [PATCH 4/5] =?UTF-8?q?[=E9=98=9F=E5=90=8D:=20=E5=A4=A7=E5=8A=9B?=
 =?UTF-8?q?=E5=87=BA=E5=A5=87=E8=BF=B9][=E9=A1=B9=E7=9B=AE:=20=E9=B2=B2?=
 =?UTF-8?q?=E9=B9=8F=E5=BA=94=E7=94=A8=E5=88=9B=E5=85=88=E5=A4=A7=E8=B5=9B?=
 =?UTF-8?q?openeuler-gnulib=E7=BC=96=E8=AF=91=E4=BC=98=E5=8C=96]=20[?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=E8=AF=B4=E6=98=8E=EF=BC=9A=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?cpu=E4=B8=AA=E6=95=B0=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=88=A9=E7=94=A8=E7=8E=87]=20[=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=E9=A3=8E=E9=99=A9=EF=BC=9A=E5=A6=82=E6=9E=9C=E8=AE=BF=E9=97=AE?=
 =?UTF-8?q?=E5=9D=97=E5=8C=BA=E5=9F=9F=EF=BC=8C=E5=8F=AF=E8=83=BD=E4=BC=9A?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=8A=A2=E5=8D=A0]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gnulib.spec | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnulib.spec b/gnulib.spec
index d263508..25146f7 100644
--- a/gnulib.spec
+++ b/gnulib.spec
@@ -50,6 +50,13 @@ rm lib/javaversion.class
 ./gnulib-tool --create-testdir --dir=build-gnulib-root git-merge-changelog
 
 %build
+#获取当前max cpu个数，合理使用资源先，由于此次比赛时间紧迫，且没有时间进行验证，暂且只保证编译通过。
+ncpus=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+max_cpus=$(( ($(free -g | awk '/^Mem:/{print $2}') + 1) / 2 ))
+if [ "$max_cpus" -ge 1 -a "$max_cpus" -lt "$ncpus" ]; then
+  ncpus="$max_cpus"
+fi
+
 cd build-gnulib-root
 %configure --prefix=%_prefix
 %make_build
@@ -69,7 +76,7 @@ sed -i "/^[ ]*gnulib_dir=/s#\`[^\`]*\`#%{_datadir}/gnulib#" gnulib-tool
 rm -rf */.cvsignore */.gitignore */.gitattributes lib/.cppi-disable lib/uniname/gen-uninames.lisp
 
 %check
-make -C build-tests check VERBOSE=1
+make -j"$ncpus" -C build-tests check VERBOSE=1
 
 %install
 #开启OpenMP线程核绑定，由于此次比赛时间紧迫，且没有时间进行验证，暂且只保证编译通过。
@@ -89,7 +96,7 @@ cp -arv doc/relocatable.texi %{buildroot}%{_datadir}/gnulib/doc
 cp -p doc/gnulib.info %{buildroot}%{_datadir}/info/
 cp -p doc/gnulib.html MODULES.html NEWS COPYING ChangeLog users.txt doc/COPYING* %{buildroot}%{_docdir}/gnulib/
 
-%make_install -C build-gnulib-root
+%make_install -j"$ncpus" -C build-gnulib-root
 help2man -N --no-discard-stderr %{buildroot}%{_bindir}/git-merge-changelog | gzip -9c > %{buildroot}%{_mandir}/man1/git-merge-changelog.1.gz
 
 %post help
-- 
Gitee


From e56b1fe977cc1315eed570f0104003407d51846d Mon Sep 17 00:00:00 2001
From: "fuhua.wang" <wangallen323@gmail.com>
Date: Fri, 30 Jul 2021 17:10:37 +0800
Subject: [PATCH 5/5] =?UTF-8?q?[=E9=98=9F=E5=90=8D:=20=E5=A4=A7=E5=8A=9B?=
 =?UTF-8?q?=E5=87=BA=E5=A5=87=E8=BF=B9][=E9=A1=B9=E7=9B=AE:=20=E9=B2=B2?=
 =?UTF-8?q?=E9=B9=8F=E5=BA=94=E7=94=A8=E5=88=9B=E5=85=88=E5=A4=A7=E8=B5=9B?=
 =?UTF-8?q?openeuler-gnulib=E7=BC=96=E8=AF=91=E4=BC=98=E5=8C=96]=20[?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=E8=AF=B4=E6=98=8E=EF=BC=9A=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?cpu=E4=B8=AA=E6=95=B0=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=88=A9=E7=94=A8=E7=8E=87]=20[=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=E9=A3=8E=E9=99=A9=EF=BC=9A=E5=8F=AF=E8=83=BD=E4=BC=9A=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E6=8A=A2=E5=8D=A0]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gnulib.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnulib.spec b/gnulib.spec
index 25146f7..79c9067 100644
--- a/gnulib.spec
+++ b/gnulib.spec
@@ -96,7 +96,7 @@ cp -arv doc/relocatable.texi %{buildroot}%{_datadir}/gnulib/doc
 cp -p doc/gnulib.info %{buildroot}%{_datadir}/info/
 cp -p doc/gnulib.html MODULES.html NEWS COPYING ChangeLog users.txt doc/COPYING* %{buildroot}%{_docdir}/gnulib/
 
-%make_install -j"$ncpus" -C build-gnulib-root
+%make_install -j16 -C build-gnulib-root
 help2man -N --no-discard-stderr %{buildroot}%{_bindir}/git-merge-changelog | gzip -9c > %{buildroot}%{_mandir}/man1/git-merge-changelog.1.gz
 
 %post help
-- 
Gitee