From 717f2a929bd25b62a0427e8e5c3792a0939dbfce Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: May 23 2020 12:00:10 +0000 Subject: Add %mingw_make_build and %mingw_make_install --- diff --git a/macros.mingw b/macros.mingw index c152d6d..78417ef 100644 --- a/macros.mingw +++ b/macros.mingw @@ -62,10 +62,10 @@ run_mingw_configure run_mingw_make() \ { \ %if 0%{?mingw_build_win32} == 1 \ -make -C build_win32$MINGW_BUILDDIR_SUFFIX "$@" $MINGW32_MAKE_ARGS \ +%{__make} -C build_win32$MINGW_BUILDDIR_SUFFIX "$@" $MINGW32_MAKE_ARGS \ %endif \ %if 0%{?mingw_build_win64} == 1 \ -make -C build_win64$MINGW_BUILDDIR_SUFFIX "$@" $MINGW64_MAKE_ARGS \ +%{__make} -C build_win64$MINGW_BUILDDIR_SUFFIX "$@" $MINGW64_MAKE_ARGS \ %endif \ } \ run_mingw_make @@ -184,5 +184,6 @@ DESTDIR=%{buildroot} ninja -C build_win64$MINGW_BUILDDIR_SUFFIX install \ } \ run_mingw_ninja_install -# Deprecated: -%mingw_make_install %mingw_make install + +%mingw_make_build %mingw_make %{_make_output_sync} %{?_smp_mflags} %{_make_verbose} +%mingw_make_install %mingw_make install DESTDIR=%{?buildroot} INSTALL="%{__install} -p" diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 072d1cf..cf860f5 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -6,7 +6,7 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: mingw-filesystem -Version: 112 +Version: 113 Release: 1%{?dist} Summary: MinGW cross compiler base filesystem and environment @@ -317,6 +317,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/ %changelog +* Sat May 23 2020 Sandro Mani - 113-1 +- Add %%mingw_make_build and %%mingw_make_install + * Fri May 22 2020 Sandro Mani - 112-1 - Fix %%mingw_meson resulting in ERROR: Unable to determine dynamic linker