-
-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #115 from nehaljwani/6.10.0
Fix build on macOS
- Loading branch information
Showing
3 changed files
with
33 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
recipe/0001-don-t-set-arch.patch → recipe/patches/0001-don-t-set-arch.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,17 @@ | ||
From 91f9869be5a433e1c8d83969d42c60e94d2367ec Mon Sep 17 00:00:00 2001 | ||
From 750da58488140d58536146c9c7409845f135684a Mon Sep 17 00:00:00 2001 | ||
From: Isuru Fernando <[email protected]> | ||
Date: Sat, 17 Oct 2020 22:37:44 -0500 | ||
Subject: [PATCH] don't set -arch | ||
Subject: [PATCH 1/2] don't set -arch | ||
|
||
--- | ||
bootloader/wscript | 2 -- | ||
1 file changed, 2 deletions(-) | ||
|
||
diff --git a/bootloader/wscript b/bootloader/wscript | ||
index b68de674..6470b333 100644 | ||
index 46650090b..07d2e0cad 100644 | ||
--- a/bootloader/wscript | ||
+++ b/bootloader/wscript | ||
@@ -376,8 +376,6 @@ def check_arch_cflag(cflag32, cflag64): | ||
@@ -320,8 +320,6 @@ def check_arch_cflag(cflag32, cflag64): | ||
else: | ||
# Default to whatever the compiler is configured to build. | ||
mac_arch = [] | ||
|
27 changes: 27 additions & 0 deletions
27
recipe/patches/0002-Specify-missing-header-for-_NSGetExecutablePath.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
From cb8b11e8c95d6e7d4eae7f4dc1436420671cf647 Mon Sep 17 00:00:00 2001 | ||
From: Nehal J Wani <[email protected]> | ||
Date: Sun, 11 Aug 2024 22:53:11 +0100 | ||
Subject: [PATCH 2/2] Specify missing header for _NSGetExecutablePath | ||
|
||
--- | ||
bootloader/src/pyi_main.c | 4 ++++ | ||
1 file changed, 4 insertions(+) | ||
|
||
diff --git a/bootloader/src/pyi_main.c b/bootloader/src/pyi_main.c | ||
index 008896613..1edf8cb56 100644 | ||
--- a/bootloader/src/pyi_main.c | ||
+++ b/bootloader/src/pyi_main.c | ||
@@ -41,6 +41,10 @@ | ||
#include <Carbon/Carbon.h> /* TransformProcessType */ | ||
#endif | ||
|
||
+#if defined(__APPLE__) | ||
+ #include <mach-o/dyld.h> /* _NSGetExecutablePath() */ | ||
+#endif | ||
+ | ||
/* PyInstaller headers. */ | ||
#include "pyi_main.h" | ||
#include "pyi_global.h" /* PYI_PATH_MAX */ | ||
-- | ||
2.33.1 | ||
|