aboutsummaryrefslogtreecommitdiffstats
path: root/build.macros.in
diff options
context:
space:
mode:
authorJani Välimaa <wally@mageia.org>2019-12-26 00:37:48 +0200
committerJani Välimaa <wally@mageia.org>2019-12-26 00:37:48 +0200
commit972c77cacf57e8e4132c9bdde4a18adf2fbea2ea (patch)
tree734dfd28776974edee18690f3f310c8987e9a349 /build.macros.in
parent1c374a73d1c693010d8912cdd5fada2687d0ee15 (diff)
downloadrpm-setup-972c77cacf57e8e4132c9bdde4a18adf2fbea2ea.tar
rpm-setup-972c77cacf57e8e4132c9bdde4a18adf2fbea2ea.tar.gz
rpm-setup-972c77cacf57e8e4132c9bdde4a18adf2fbea2ea.tar.bz2
rpm-setup-972c77cacf57e8e4132c9bdde4a18adf2fbea2ea.tar.xz
rpm-setup-972c77cacf57e8e4132c9bdde4a18adf2fbea2ea.zip
Replace setup_compile_flags rpm macro with upstream set_build_flags macro
Deprecation warning is output is %setup_compile_flags is used.
Diffstat (limited to 'build.macros.in')
-rw-r--r--build.macros.in8
1 files changed, 3 insertions, 5 deletions
diff --git a/build.macros.in b/build.macros.in
index e9edd4a..7798ec5 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -224,13 +224,11 @@ 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 \
- CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
- CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
- FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
- LDFLAGS="${LDFLAGS:-%ldflags}" ; export LDFLAGS
+ echo "warning: %%setup_compile_flags is deprecated, try %%set_build_flags" 1>&2\
+ %set_build_flags
%before_configure \
- %setup_compile_flags \
+ %set_build_flags \
CONFIGURE_TOP="${CONFIGURE_TOP:-.}"; \
%{?!_disable_ld_as_needed:@RPMVENDORDIR@/force-as-needed-for-shared-lib-in-libtool ;} \
%{?!_disable_ld_no_undefined:@RPMVENDORDIR@/drop-ld-no-undefined-for-shared-lib-modules-in-libtool ;} \