import mingw-filesystem-104-2.el8

This commit is contained in:
CentOS Sources 2021-05-18 02:52:23 -04:00 committed by Andrew Lukoshko
parent 260825859c
commit 36e80ab6f6
5 changed files with 14 additions and 5 deletions

View File

@ -151,8 +151,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

@ -151,8 +151,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

@ -8,6 +8,8 @@ pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib' ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
strip = '/usr/bin/i686-w64-mingw32-strip' strip = '/usr/bin/i686-w64-mingw32-strip'
windres = '/usr/bin/i686-w64-mingw32-windres' windres = '/usr/bin/i686-w64-mingw32-windres'
dlltool = '/usr/bin/i686-w64-mingw32-dlltool'
libgcrypt-config = '/usr/i686-w64-mingw32/sys-root/mingw/bin/libgcrypt-config'
[properties] [properties]
root = '/usr/i686-w64-mingw32/sys-root/mingw' root = '/usr/i686-w64-mingw32/sys-root/mingw'

View File

@ -8,6 +8,8 @@ pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib' ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
strip = '/usr/bin/x86_64-w64-mingw32-strip' strip = '/usr/bin/x86_64-w64-mingw32-strip'
windres = '/usr/bin/x86_64-w64-mingw32-windres' windres = '/usr/bin/x86_64-w64-mingw32-windres'
dlltool = '/usr/bin/x86_64-w64-mingw32-dlltool'
libgcrypt-config = '/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libgcrypt-config'
[properties] [properties]
root = '/usr/x86_64-w64-mingw32/sys-root/mingw' root = '/usr/x86_64-w64-mingw32/sys-root/mingw'

View File

@ -7,7 +7,7 @@
Name: mingw-filesystem Name: mingw-filesystem
Version: 104 Version: 104
Release: 1%{?dist} Release: 2%{?dist}
Summary: MinGW cross compiler base filesystem and environment Summary: MinGW cross compiler base filesystem and environment
Group: Development/Libraries Group: Development/Libraries
@ -317,6 +317,11 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
%changelog %changelog
* Thu Feb 04 2021 Uri Lublin <uril@redhat.com> - 104-2
- Fix building with meson >= 0.54
Resolves: rhbz#1918306
Related: rhbz#1872692
* Fri Apr 20 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 104-1 * Fri Apr 20 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 104-1
- Add macros for meson and ninja - Add macros for meson and ninja