- merged 2.025 from PLD

[packages/rpm-tld-macros.git] / macros.tld

diff --git a/macros.tld b/macros.tld
index f12b3d518796ca73751f0fd7b7bea82333294343..06111e3b454770828c8a37f72aff3cd5799c0bbe 100644 (file)
--- a/macros.tld
+++ b/macros.tld
@@ -27,6 +27,8 @@
 %_lispdir                      %{_datadir}/emacs/site-lisp
 %_initddir                     %{_sysconfdir}/rc.d/init.d
 
+%_metainfodir  %{_datadir}/metainfo
+
 %_defaultdocdir                %{_usr}/share/doc
 
 %_fmoddir              %{_libdir}/gfortran/modules
@@ -486,6 +488,13 @@ CPPFLAGS="${CPPFLAGS:-%{rpmcppflags}}" \\\
 %{__cmake} \\\
        -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
        -DCMAKE_BUILD_TYPE=%{!?debug:TLD}%{?debug:Debug} \\\
+       -DCMAKE_SYSTEM_NAME=Linux \\\
+       -DCMAKE_CROSSCOMPILING:BOOL=FALSE \\\
+%ifarch x32\
+       -DCMAKE_SYSTEM_PROCESSOR=x86_64 \\\
+%else\
+       -DCMAKE_SYSTEM_PROCESSOR=%{_target_cpu} \\\
+%endif\
        -DCMAKE_INSTALL_BINDIR:PATH=%{_bindir} \\\
        -DCMAKE_INSTALL_SBINDIR:PATH=%{_sbindir} \\\
        -DCMAKE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \\\
@@ -550,6 +559,8 @@ CFLAGS="${CFLAGS:-%{rpmcflags}}" \
 CPPFLAGS="${CPPFLAGS:-%{rpmcppflags}}" \
 CXXFLAGS="${CXXFLAGS:-%{rpmcxxflags}}" \
 LDFLAGS="${LDFLAGS:-%{rpmldflags}}" \
+RUSTC="${RUSTC:-%{__rustc}}" \
+RUSTFLAGS="${RUSTFLAGS:-%{rpmrustflags} --target %rust_target}" \
 LC_ALL=C.UTF-8 %{__meson} \
        --buildtype=plain \
        --bindir=%{_bindir} \