diff options
author | Martchus | 2020-04-15 11:20:58 +0200 |
---|---|---|
committer | Martchus | 2020-04-15 11:20:58 +0200 |
commit | dd10668066e7b312041c8c09791fdbf9eb1744bf (patch) | |
tree | 16829b87ad101f915917229fe336787f2e625641 /0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch | |
parent | e62e2be36b21082e3f4e495389c2daab2d1f80a6 (diff) | |
download | aur-dd10668066e7b312041c8c09791fdbf9eb1744bf.tar.gz |
Sync with other variants; fix checksum
Diffstat (limited to '0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch')
-rw-r--r-- | 0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch index a6cee1132338..7e41b92d9323 100644 --- a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch +++ b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch @@ -1,7 +1,7 @@ -From 07a334d39698cc7d2826ed1b5b6cb9b67dd4def8 Mon Sep 17 00:00:00 2001 +From c416378bd70ab26f9ce9e34fe72a364dd19bae73 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 18:30:51 +0100 -Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with +Subject: [PATCH 01/31] Adjust win32-g++ profile for cross compilation with mingw-w64 Adding a new, separate mkspec instead of patching the existing one @@ -12,6 +12,8 @@ So for this to work, the mkspec must be called win32-g++. Also see the following issues: * https://github.com/Martchus/PKGBUILDs/issues/59 * https://github.com/Martchus/PKGBUILDs/issues/60 + +Change-Id: I4c9b3c170ed13943abe0d8b397a8cb9e360538b6 --- mkspecs/common/g++-win32.conf | 52 ++++++++++++++++++++---------- mkspecs/win32-clang-g++/qmake.conf | 4 +-- @@ -125,7 +127,7 @@ index c3a1f3a373..5208d22bd6 100644 -include(angle.conf) -include(windows-vulkan.conf) diff --git a/mkspecs/win32-clang-g++/qmake.conf b/mkspecs/win32-clang-g++/qmake.conf -index 4630ec4602..3f9fdc72b1 100644 +index 59d42176f0..f8cb9859f2 100644 --- a/mkspecs/win32-clang-g++/qmake.conf +++ b/mkspecs/win32-clang-g++/qmake.conf @@ -14,11 +14,11 @@ include(../common/g++-win32.conf) @@ -161,5 +163,5 @@ index 5de482f23b..3c3d22c699 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.22.0 +2.26.0 |