diff --git a/coreutils.spec b/coreutils.spec index 109e69e471ca85b9d6a50f557d3592e591a3b8d2..75848441bb50af01104e2feffc79ebb140f7f395 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,8 +1,9 @@ %global ENABLE_RELOC 1 +%define _find_debuginfo_opts -strip_a 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/ @@ -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 @@ -184,6 +176,9 @@ fi %endif %changelog +* 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 - add sub rpm coreutils-relocation