From f9a453da93911405aa748a92f82906da5bf43168 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sun, 11 Aug 2024 22:54:20 +0100 Subject: [PATCH] Add missing header for _NSGetExecutablePath It was lost in a refactor: https://github.com/pyinstaller/pyinstaller/commit/c3167147 --- recipe/meta.yaml | 3 ++- .../{ => patches}/0001-don-t-set-arch.patch | 8 +++--- ...sing-header-for-_NSGetExecutablePath.patch | 27 +++++++++++++++++++ 3 files changed, 33 insertions(+), 5 deletions(-) rename recipe/{ => patches}/0001-don-t-set-arch.patch (74%) create mode 100644 recipe/patches/0002-Specify-missing-header-for-_NSGetExecutablePath.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 64b8a8d..fd94319 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,8 @@ source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz sha256: {{ sha256 }} patches: - - 0001-don-t-set-arch.patch + - patches/0001-don-t-set-arch.patch + - patches/0002-Specify-missing-header-for-_NSGetExecutablePath.patch build: number: 0 diff --git a/recipe/0001-don-t-set-arch.patch b/recipe/patches/0001-don-t-set-arch.patch similarity index 74% rename from recipe/0001-don-t-set-arch.patch rename to recipe/patches/0001-don-t-set-arch.patch index fa9aa84..f83edbb 100644 --- a/recipe/0001-don-t-set-arch.patch +++ b/recipe/patches/0001-don-t-set-arch.patch @@ -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 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 = [] diff --git a/recipe/patches/0002-Specify-missing-header-for-_NSGetExecutablePath.patch b/recipe/patches/0002-Specify-missing-header-for-_NSGetExecutablePath.patch new file mode 100644 index 0000000..d849ea7 --- /dev/null +++ b/recipe/patches/0002-Specify-missing-header-for-_NSGetExecutablePath.patch @@ -0,0 +1,27 @@ +From cb8b11e8c95d6e7d4eae7f4dc1436420671cf647 Mon Sep 17 00:00:00 2001 +From: Nehal J Wani +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 /* TransformProcessType */ + #endif + ++#if defined(__APPLE__) ++ #include /* _NSGetExecutablePath() */ ++#endif ++ + /* PyInstaller headers. */ + #include "pyi_main.h" + #include "pyi_global.h" /* PYI_PATH_MAX */ +-- +2.33.1 +