[meld/meld-3-14] setup_win32: Fix for library include order issues related to msys
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/meld-3-14] setup_win32: Fix for library include order issues related to msys
- Date: Sat, 12 Dec 2015 00:36:54 +0000 (UTC)
commit 7c3a06132f34c5d585c6bcd97800c95754e0cddd
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Dec 12 10:33:35 2015 +1000
setup_win32: Fix for library include order issues related to msys
An update of msysgit has somehow pulled in libffi into the path that
cx_freeze searches to find its libraries. On the only build box that
matters, this causes us to include a 64-bit libffi with our
otherwise-32-bit build, breaking everything.
I won't even pretend to understand how the change in this patch
fixes the problem, but after several hours fighting Windows +
cx_freeze path resolution I also really, really don't care.
setup_win32.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/setup_win32.py b/setup_win32.py
index 36c509f..a378671 100644
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -66,6 +66,7 @@ build_exe_options = {
"includes": ["gi"],
"packages": ["gi", "weakref"],
"include_files": include_files,
+ "bin_path_excludes": [""],
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]