Fix mingw_meson resulting in ERROR: Unable to determine dynamic linker

This commit is contained in:
Sandro Mani 2020-05-22 21:44:20 +02:00
parent 64521a8bdb
commit 3ad1f950f2
3 changed files with 8 additions and 5 deletions

View File

@ -152,8 +152,8 @@
%mingw32_qmake_qt5 /usr/bin/mingw32-qmake-qt5 %mingw32_qmake_qt5 /usr/bin/mingw32-qmake-qt5
%mingw32_meson %{mingw32_env} ; \ %mingw32_meson %{mingw32_env} ; \
unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LDFLAGS; \\\ unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
export CFLAGS="%{__global_cflags}" CXXFLAGS="%{__global_cxxflags}" LDFLAGS="%{__global_ldflags}"; \\\ export CFLAGS="%{mingw32_cflags}" CXXFLAGS="%{mingw32_cflags}" LDFLAGS="%{mingw32_ldflags}"; \\\
if test -f meson.build; then __mingw32_topdir=.; \\\ if test -f meson.build; then __mingw32_topdir=.; \\\
elif test -f ../meson.build; then __mingw32_topdir=..; \\\ elif test -f ../meson.build; then __mingw32_topdir=..; \\\
else __mingw32_topdir=""; fi; \\\ else __mingw32_topdir=""; fi; \\\

View File

@ -152,8 +152,8 @@
%mingw64_qmake_qt5 /usr/bin/mingw64-qmake-qt5 %mingw64_qmake_qt5 /usr/bin/mingw64-qmake-qt5
%mingw64_meson %{mingw64_env} ; \ %mingw64_meson %{mingw64_env} ; \
unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LDFLAGS; \\\ unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
export CFLAGS="%{__global_cflags}" CXXFLAGS="%{__global_cxxflags}" LDFLAGS="%{__global_ldflags}"; \\\ export CFLAGS="%{mingw64_cflags}" CXXFLAGS="%{mingw64_cflags}" LDFLAGS="%{mingw64_ldflags}"; \\\
if test -f meson.build; then __mingw64_topdir=.; \\\ if test -f meson.build; then __mingw64_topdir=.; \\\
elif test -f ../meson.build; then __mingw64_topdir=..; \\\ elif test -f ../meson.build; then __mingw64_topdir=..; \\\
else __mingw64_topdir=""; fi; \\\ else __mingw64_topdir=""; fi; \\\

View File

@ -6,7 +6,7 @@
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
Name: mingw-filesystem Name: mingw-filesystem
Version: 111 Version: 112
Release: 1%{?dist} Release: 1%{?dist}
Summary: MinGW cross compiler base filesystem and environment Summary: MinGW cross compiler base filesystem and environment
@ -317,6 +317,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
%changelog %changelog
* Fri May 22 2020 Sandro Mani <manisandro@gmail.com> - 112-1
- Fix %%mingw_meson resulting in ERROR: Unable to determine dynamic linker
* Fri May 01 2020 David Woodhouse <dwmw2@infradead.org> - 111-1 * Fri May 01 2020 David Woodhouse <dwmw2@infradead.org> - 111-1
- Quote tr sequences like '[blank]' to prevent the shell from doing so (#1830233) - Quote tr sequences like '[blank]' to prevent the shell from doing so (#1830233)