make the %build section idempotent

... so that we can run `fedpkg compile --short` repeatedly
This commit is contained in:
Kamil Dudka 2020-10-14 18:10:58 +02:00
parent 441f1d7519
commit f4b85e63ba

View File

@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils Name: coreutils
Version: 8.32 Version: 8.32
Release: 12%{?dist} Release: 13%{?dist}
License: GPLv3+ License: GPLv3+
Url: https://www.gnu.org/software/coreutils/ Url: https://www.gnu.org/software/coreutils/
Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
@ -179,10 +179,13 @@ CFLAGS="$CFLAGS -Dlint"
# make mknod work again in chroot without /proc being mounted (#1811038) # make mknod work again in chroot without /proc being mounted (#1811038)
export ac_cv_func_lchmod="no" export ac_cv_func_lchmod="no"
# needed for out-of-tree build
%global _configure ../configure
%{expand:%%global optflags %{optflags} -D_GNU_SOURCE=1} %{expand:%%global optflags %{optflags} -D_GNU_SOURCE=1}
for type in separate single; do for type in separate single; do
mkdir $type && \ mkdir -p $type && \
(cd $type && ln -s ../configure || exit 1 (cd $type || exit $?
if test $type = 'single'; then if test $type = 'single'; then
config_single='--enable-single-binary' config_single='--enable-single-binary'
config_single="$config_single --without-openssl" # smaller/slower sha*sum config_single="$config_single --without-openssl" # smaller/slower sha*sum
@ -199,7 +202,7 @@ for type in separate single; do
%make_build all V=1 %make_build all V=1
# make sure that parse-datetime.{c,y} ends up in debuginfo (#1555079) # make sure that parse-datetime.{c,y} ends up in debuginfo (#1555079)
ln -v ../lib/parse-datetime.{c,y} . ln -fv ../lib/parse-datetime.{c,y} .
) )
done done
@ -272,6 +275,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
%license COPYING %license COPYING
%changelog %changelog
* Wed Oct 14 2020 Kamil Dudka <kdudka@redhat.com> - 8.32-13
- make the %%build section idempotent
* Mon Aug 17 2020 Kamil Dudka <kdudka@redhat.com> - 8.32-12 * Mon Aug 17 2020 Kamil Dudka <kdudka@redhat.com> - 8.32-12
- do not install /etc/DIR_COLORS.256color (#1830318) - do not install /etc/DIR_COLORS.256color (#1830318)