diff options
| author | Jani Välimaa <wally@mageia.org> | 2019-12-27 11:59:36 +0200 |
|---|---|---|
| committer | Jani Välimaa <wally@mageia.org> | 2019-12-27 11:59:36 +0200 |
| commit | 42154015211347afcc2c33d3f913ecc1f0ae061e (patch) | |
| tree | 62d9d4715958048d4618274150644cd86deb58e7 | |
| parent | 98c2d2b8c69185ba23a66c4004b2a09a1d48e093 (diff) | |
| download | rpm-setup-42154015211347afcc2c33d3f913ecc1f0ae061e.tar rpm-setup-42154015211347afcc2c33d3f913ecc1f0ae061e.tar.gz rpm-setup-42154015211347afcc2c33d3f913ecc1f0ae061e.tar.bz2 rpm-setup-42154015211347afcc2c33d3f913ecc1f0ae061e.tar.xz rpm-setup-42154015211347afcc2c33d3f913ecc1f0ae061e.zip | |
build.macros: use %{warn:...} macro for deprecation warnings
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | build.macros.in | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -1,3 +1,4 @@ +- build.macros: use rpm built-in %{warn:...} macro for deprecation warnings - remove unused git-repository--after-tarball and git-repository--apply-patch - build.macros: remove %_after_setup leftovers after introduce-_after_setup-which-is-called-after-setup.patch was removed from rpm diff --git a/build.macros.in b/build.macros.in index 9595931..a48fa9c 100644 --- a/build.macros.in +++ b/build.macros.in @@ -197,11 +197,11 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o %{nil} %make \ - echo "warning: %%make is deprecated, try %%make_build instead" 1>&2\ + %{warn:%%make is deprecated, use %%make_build instead} \ %{__make} -O %_smp_mflags %makeinstall_std \ - echo "warning: %%makeinstall_std is deprecated, try %%make_install instead" 1>&2\ + %{warn:%%makeinstall_std is deprecated, use %%make_install instead} \ make DESTDIR=%{?buildroot:%{buildroot}} install %__fix_libtool_ltmain_from_overlinking @RPMVENDORDIR@/fix-libtool-ltmain-from-overlinking @@ -216,7 +216,7 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o %ldflags %{?!_disable_ld_as_needed: -Wl,--as-needed}%{?!_disable_ld_no_undefined: -Wl,--no-undefined}%{?!_disable_ld_relro: -Wl,-z,relro}%{?!_disable_ld_O1: -Wl,-O1}%{?!_disable_ld_build_id: -Wl,--build-id}%{?!_disable_ld_enable_new_dtags: -Wl,--enable-new-dtags} %setup_compile_flags \ - echo "warning: %%setup_compile_flags is deprecated, try %%set_build_flags" 1>&2\ + %{warn:%%setup_compile_flags is deprecated, use %%set_build_flags instead} \ %set_build_flags %before_configure \ |