diff --git a/macros b/macros index 2eca9bb..cc0f895 100644 --- a/macros +++ b/macros @@ -86,13 +86,14 @@ # have not been set already. RPM_OPT_FLAGS and RPM_LD_FLAGS have already # been set implicitly at the start of the %%build section. # LT_SYS_LIBRARY_PATH is used by libtool script. +# RUSTFLAGS is only set when %%{build_rustflags} is available. %set_build_flags \ CFLAGS="${CFLAGS:-%{build_cflags}}" ; export CFLAGS ; \ CXXFLAGS="${CXXFLAGS:-%{build_cxxflags}}" ; export CXXFLAGS ; \ FFLAGS="${FFLAGS:-%{build_fflags}}" ; export FFLAGS ; \ FCFLAGS="${FCFLAGS:-%{build_fflags}}" ; export FCFLAGS ; \ - VALAFLAGS="${VALAFLAGS:-%{build_valaflags}}" ; export VALAFLAGS ; \ - RUSTFLAGS="${RUSTFLAGS:-%{build_rustflags}}" ; export RUSTFLAGS ; \ + VALAFLAGS="${VALAFLAGS:-%{build_valaflags}}" ; export VALAFLAGS ;%{?build_rustflags: + RUSTFLAGS="${RUSTFLAGS:-%{build_rustflags}}" ; export RUSTFLAGS ;} \ LDFLAGS="${LDFLAGS:-%{build_ldflags}}" ; export LDFLAGS ; \ LT_SYS_LIBRARY_PATH="${LT_SYS_LIBRARY_PATH:-%_libdir:}" ; export LT_SYS_LIBRARY_PATH ; \ CC="${CC:-%{__cc}}" ; export CC ; \ diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index aaf3a16..c15643e 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -4,7 +4,7 @@ # 2) When making changes, increment the version (in baserelease) by 1. # rpmdev-bumpspec and other tools update the macro below, which is used # in Version: to get the desired effect. -%global baserelease 274 +%global baserelease 275 Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config @@ -256,7 +256,10 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora common.lua %doc buildflags.md %changelog -* Wed Jan 3 2024 Florian Weimer - 275-1 +* Fri Jan 05 2024 Yaakov Selkowitz - 275-1 +- Define RUSTFLAGS only when rust macros are installed + +* Wed Jan 3 2024 Florian Weimer - 274-1 - Missing packed relative relocation support on aarch64, s390x (#2256645) * Tue Jan 2 2024 Florian Weimer - 273-1