From 27c114a78a43ab754dacb0e2c559ef5045b9f2d2 Mon Sep 17 00:00:00 2001
From: rockyautomation <rockyautomation@rockylinux.org>
Date: Tue, 18 May 2021 21:46:09 +0000
Subject: [PATCH] import mingw-filesystem-104-2.el8
---
SOURCES/macros.mingw32 | 4 ++--
SOURCES/macros.mingw64 | 4 ++--
SOURCES/toolchain-mingw32.meson | 2 ++
SOURCES/toolchain-mingw64.meson | 2 ++
SPECS/mingw-filesystem.spec | 7 ++++++-
5 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/SOURCES/macros.mingw32 b/SOURCES/macros.mingw32
index 1e7bd36..c5ae331 100644
--- a/SOURCES/macros.mingw32
+++ b/SOURCES/macros.mingw32
@@ -151,8 +151,8 @@
%mingw32_qmake_qt5 /usr/bin/mingw32-qmake-qt5
%mingw32_meson %{mingw32_env} ; \
- unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LDFLAGS; \\\
- export CFLAGS="%{__global_cflags}" CXXFLAGS="%{__global_cxxflags}" LDFLAGS="%{__global_ldflags}"; \\\
+ unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
+ export CFLAGS="%{mingw32_cflags}" CXXFLAGS="%{mingw32_cflags}" LDFLAGS="%{mingw32_ldflags}"; \\\
if test -f meson.build; then __mingw32_topdir=.; \\\
elif test -f ../meson.build; then __mingw32_topdir=..; \\\
else __mingw32_topdir=""; fi; \\\
diff --git a/SOURCES/macros.mingw64 b/SOURCES/macros.mingw64
index 55857d6..e963ea2 100644
--- a/SOURCES/macros.mingw64
+++ b/SOURCES/macros.mingw64
@@ -151,8 +151,8 @@
%mingw64_qmake_qt5 /usr/bin/mingw64-qmake-qt5
%mingw64_meson %{mingw64_env} ; \
- unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LDFLAGS; \\\
- export CFLAGS="%{__global_cflags}" CXXFLAGS="%{__global_cxxflags}" LDFLAGS="%{__global_ldflags}"; \\\
+ unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
+ export CFLAGS="%{mingw64_cflags}" CXXFLAGS="%{mingw64_cflags}" LDFLAGS="%{mingw64_ldflags}"; \\\
if test -f meson.build; then __mingw64_topdir=.; \\\
elif test -f ../meson.build; then __mingw64_topdir=..; \\\
else __mingw64_topdir=""; fi; \\\
diff --git a/SOURCES/toolchain-mingw32.meson b/SOURCES/toolchain-mingw32.meson
index 127d413..4d3000b 100644
--- a/SOURCES/toolchain-mingw32.meson
+++ b/SOURCES/toolchain-mingw32.meson
@@ -8,6 +8,8 @@ pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
strip = '/usr/bin/i686-w64-mingw32-strip'
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]
root = '/usr/i686-w64-mingw32/sys-root/mingw'
diff --git a/SOURCES/toolchain-mingw64.meson b/SOURCES/toolchain-mingw64.meson
index 9e0a180..918bee0 100644
--- a/SOURCES/toolchain-mingw64.meson
+++ b/SOURCES/toolchain-mingw64.meson
@@ -8,6 +8,8 @@ pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
strip = '/usr/bin/x86_64-w64-mingw32-strip'
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]
root = '/usr/x86_64-w64-mingw32/sys-root/mingw'
diff --git a/SPECS/mingw-filesystem.spec b/SPECS/mingw-filesystem.spec
index d96cc48..40720df 100644
--- a/SPECS/mingw-filesystem.spec
+++ b/SPECS/mingw-filesystem.spec
@@ -7,7 +7,7 @@
Name: mingw-filesystem
Version: 104
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW cross compiler base filesystem and environment
Group: Development/Libraries
@@ -317,6 +317,11 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
%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
- Add macros for meson and ninja
--
GitLab