diff options
| author | Jani Välimaa <wally@mageia.org> | 2020-01-03 13:00:13 +0200 |
|---|---|---|
| committer | Jani Välimaa <wally@mageia.org> | 2020-01-03 13:00:13 +0200 |
| commit | d21898961a7ed6c8e703820c7ebfed3f8dbff855 (patch) | |
| tree | abd69bce4ad66a21143ccd81dd31629478a8b11f | |
| parent | e4cf477c8e681fbb3dc723bc7461cea5ad4ec1aa (diff) | |
| download | rpm-setup-d21898961a7ed6c8e703820c7ebfed3f8dbff855.tar rpm-setup-d21898961a7ed6c8e703820c7ebfed3f8dbff855.tar.gz rpm-setup-d21898961a7ed6c8e703820c7ebfed3f8dbff855.tar.bz2 rpm-setup-d21898961a7ed6c8e703820c7ebfed3f8dbff855.tar.xz rpm-setup-d21898961a7ed6c8e703820c7ebfed3f8dbff855.zip | |
Backport %build_*, %__global_* and %set_build_flags from current cauldron
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | cauldron.macros | 18 |
3 files changed, 24 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index a75c58f..a153975 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,9 @@ pkg_data_in = $(pkg_gdata:=.in) pkg_sysconf_macros_in = $(pkg_sysconf_macros_tmp:=.in) -pkg_sysconf_macros = $(pkg_sysconf_macros_tmp) +pkg_sysconf_macros = \ + $(pkg_sysconf_macros_tmp) \ + cauldron.macros pkg_gconfig = \ platform \ @@ -85,6 +87,7 @@ EXTRA_DIST = \ $(pkg_scripts) \ $(pkg_scripts_in) \ $(redhat_defs) \ + cauldron.macros \ macros-perarch.in make_arch_macrosfiles.sh.in \ rpmgenplatform.in rpmrc.in \ rpm-spec-mode.el \ @@ -1,3 +1,5 @@ +- backport %build_*, %__global_* and and %set_build_flags macros from cauldron + Version 2.39.1 - 16 October 2019, by Pascal Terjan - actually make armv7hl chroots on aarch64 work as expected diff --git a/cauldron.macros b/cauldron.macros new file mode 100644 index 0000000..4bc2b82 --- /dev/null +++ b/cauldron.macros @@ -0,0 +1,18 @@ +# Macros ported from Cauldron and/or newer RPM releases +# + +# Compiler flags +%build_cflags %{optflags} +%build_cxxflags %{optflags} +%build_fflags %{optflags} %{?_fmoddir:-I%_fmoddir} +%build_ldflags %{ldflags} + +# Set compiler flags +%set_build_flags %setup_compile_flags + +# Deprecated names. For backwards compatibility only. +%__global_cflags %{build_cflags} +%__global_cxxflags %{build_cxxflags} +%__global_fflags %{build_fflags} +%__global_fcflags %{build_fflags} +%__global_ldflags %{build_ldflags} |