From 9d7673a677975cb217240c1dd4c31475125391f5 Mon Sep 17 00:00:00 2001 From: nicholastao Date: Wed, 13 Sep 2023 07:28:34 +0000 Subject: [PATCH 1/4] use %define _find_debuginfo_opts -strip_abuild Signed-off-by: nicholastao --- coreutils.spec | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/coreutils.spec b/coreutils.spec index 109e69e..5bd9633 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,4 +1,5 @@ %global ENABLE_RELOC 1 +%define _find_debuginfo_opts -strip_a Name: coreutils Version: 9.3 @@ -106,23 +107,14 @@ CONFIGURE_OPTS=( mkdir separate && \ (cd separate && ln -s ../configure || exit 1 -%configure "${CONFIGURE_OPTS[@]}" || : -make all %{?_smp_mflags} +%configure "${CONFIGURE_OPTS[@]}"|| : +make all %{?_smp_mflags} LDFLAGS=-Wl,--emit-relocs,-pie +find src/ -type f -executable -exec objreloc {} ';' # make sure that parse-datetime.{c,y} ends up in debuginfo (#1555079) ln -v ../lib/parse-datetime.{c,y} . ) -%if %{?ENABLE_RELOC} -mkdir rloc && \ - (cd rloc && ln -s ../configure || exit 1 -%configure "${CONFIGURE_OPTS[@]}" LDFLAGS=-Wl,--emit-relocs,-pie || : -make all %{?_smp_mflags} - -find src/ -type f -executable -exec objreloc {} ';' -) -%endif - %install (cd separate && make DESTDIR=$RPM_BUILD_ROOT install) @@ -141,7 +133,7 @@ install -p -c -m644 build-aux/coreutils-colorls.csh $RPM_BUILD_ROOT%{_sysconfdir %if %{?ENABLE_RELOC} mkdir -p ${RPM_BUILD_ROOT}/usr/lib/relocation%{_bindir} -find ${RPM_BUILD_DIR}/%{name}-%{version}/rloc/src/ -name "*.relocation" -exec install -pD {} ${RPM_BUILD_ROOT}/usr/lib/relocation%{_bindir} ';' +find ${RPM_BUILD_DIR}/%{name}-%{version}/separate/src/ -name "*.relocation" -exec install -pD {} ${RPM_BUILD_ROOT}/usr/lib/relocation%{_bindir} ';' %endif %check -- Gitee From aa5de90a9227e4e293596cef8149993a0e647734 Mon Sep 17 00:00:00 2001 From: nicholastao Date: Wed, 13 Sep 2023 07:30:05 +0000 Subject: [PATCH 2/4] use %define _find_debuginfo_opts -strip_abuild Signed-off-by: nicholastao -- Gitee From 71cd48cc1f6d04f88452f8d690bc4e218cde1dfc Mon Sep 17 00:00:00 2001 From: nicholastao Date: Wed, 13 Sep 2023 08:30:22 +0000 Subject: [PATCH 3/4] use _find_debuginfo_opts -strip_a to reduce build time Signed-off-by: nicholastao --- coreutils.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coreutils.spec b/coreutils.spec index 5bd9633..8fe1994 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -176,6 +176,9 @@ fi %endif %changelog +* Wed Sep 13 2023 taoyuxiang - 9.3-2 +- use _find_debuginfo_opts -strip_a to reduce build time + * Mon Sep 11 2023 taoyuxiang - 9.3-2 - add sub rpm coreutils-relocation -- Gitee From ef152dd5f9c9e4947e3ff49752c680331e96ab53 Mon Sep 17 00:00:00 2001 From: nicholastao Date: Wed, 13 Sep 2023 09:23:04 +0000 Subject: [PATCH 4/4] change release No. Signed-off-by: nicholastao --- coreutils.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coreutils.spec b/coreutils.spec index 8fe1994..7584844 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -3,7 +3,7 @@ Name: coreutils Version: 9.3 -Release: 2 +Release: 3 License: GPLv3+ Summary: A set of basic GNU tools commonly used in shell scripts Url: https://www.gnu.org/software/coreutils/ @@ -176,7 +176,7 @@ fi %endif %changelog -* Wed Sep 13 2023 taoyuxiang - 9.3-2 +* Wed Sep 13 2023 taoyuxiang - 9.3-3 - use _find_debuginfo_opts -strip_a to reduce build time * Mon Sep 11 2023 taoyuxiang - 9.3-2 -- Gitee