<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/abd158fe8d4007feb98ec94c25d41738e1986c9a">https://github.com/macports/macports-ports/commit/abd158fe8d4007feb98ec94c25d41738e1986c9a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit abd158fe8d4007feb98ec94c25d41738e1986c9a
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Aug 22 18:09:01 2024 +1000
<span style='display:block; white-space:pre;color:#404040;'> python312: fix crash in ctypes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The configure script was adding -DUSING_APPLE_OS_LIBFFI=1 to CFLAGS
</span><span style='display:block; white-space:pre;color:#404040;'> despite building against the MacPorts libffi.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70603
</span>---
lang/python312/Portfile | 6 ++++--
lang/python312/files/configure-disable-system-libffi.patch | 11 +++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python312/Portfile b/lang/python312/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9cd2e98687d..54d196cfcd2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python312/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python312/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,7 @@ name python312
</span>
# Remember to keep py312-tkinter and py312-gdbm's versions sync'd with this
version 3.12.5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +32,8 @@ patchfiles patch-Lib-cgi.py.diff \
</span> sysconfig.py.patch \
configure-disable-libb2.patch \
configure-disable-libuuid.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure-disable-tkinter.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure-disable-tkinter.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure-disable-system-libffi.patch
</span>
if {${os.platform} eq "darwin" && ${os.major} <= 10} {
# work around no copyfile and/or pthread_threadid_np on older systems
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +41,7 @@ if {${os.platform} eq "darwin" && ${os.major} <= 10} {
</span> patch-threadid-older-systems.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build path:bin/pkg-config:pkgconfig
</span> depends_lib port:bzip2 \
port:expat \
port:gettext-runtime \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python312/files/configure-disable-system-libffi.patch b/lang/python312/files/configure-disable-system-libffi.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..513d02e6f26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python312/files/configure-disable-system-libffi.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2024-08-22 16:50:53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-08-22 17:59:41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13689,7 +13689,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_libffi=missing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "x$ac_sys_system" = xDarwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ save_CFLAGS=$CFLAGS
</span></pre><pre style='margin:0'>
</pre>