You've already forked macports-ports
mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
Joshua Root
99c8a289aa
Also added py314 subports to dependencies needed for pep517 build of py314-gdbm and py314-tkinter.
79 lines
3.7 KiB
Diff
79 lines
3.7 KiB
Diff
--- configure.orig 2025-07-23 02:42:44
|
|
+++ configure 2025-07-27 02:15:42
|
|
@@ -4445,7 +4445,9 @@
|
|
;;
|
|
esac
|
|
|
|
- prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
|
|
+ ABIFLAGS="@@ABIFLAGS@@"
|
|
+ prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/${VERSION}${ABIFLAGS}
|
|
+ FRAMEWORKINSTALLAPPSPREFIX="@@APPLICATIONS_DIR@@"
|
|
PYTHONFRAMEWORKINSTALLNAMEPREFIX=${prefix}
|
|
RESSRCDIR=Mac/Resources/framework
|
|
|
|
@@ -7687,7 +7689,7 @@
|
|
then
|
|
case $ac_sys_system in
|
|
Darwin)
|
|
- LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)';;
|
|
+ LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)$(ABIFLAGS)/$(PYTHONFRAMEWORK)';;
|
|
iOS)
|
|
LDLIBRARY='$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)';;
|
|
*)
|
|
@@ -8492,7 +8494,7 @@
|
|
# non-suffixed name in their versioned llvm directory.
|
|
|
|
llvm_bin_dir=''
|
|
-llvm_path="${PATH}"
|
|
+llvm_path="/bin:/sbin:/usr/bin:/usr/sbin"
|
|
if test "${ac_cv_cc_name}" = "clang"
|
|
then
|
|
clang_bin=`which clang`
|
|
@@ -10723,6 +10725,11 @@
|
|
as_fn_error $? "proper usage is --with-universal-arch=universal2|32-bit|64-bit|all|intel|3-way" "$LINENO" 5
|
|
;;
|
|
esac
|
|
+
|
|
+ UNIVERSAL_ARCH_FLAGS="@@UNIVERSAL_ARCH_FLAGS@@"
|
|
+ LIPO_32BIT_FLAGS="@@LIPO_32BIT_FLAGS@@"
|
|
+ LIPO_INTEL64_FLAGS="@@LIPO_INTEL64_FLAGS@@"
|
|
+ ARCH_RUN_32BIT="@@ARCH_RUN_32BIT@@"
|
|
|
|
if test "${UNIVERSALSDK}" != "/"
|
|
then
|
|
@@ -13528,9 +13535,9 @@
|
|
LDCXXSHARED='$(CXX) -bundle'
|
|
if test "$enable_framework" ; then
|
|
# Link against the framework. All externals should be defined.
|
|
- BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
|
- LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
|
- LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
|
+ BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)$(ABIFLAGS)/$(PYTHONFRAMEWORK)'
|
|
+ LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)$(ABIFLAGS)/$(PYTHONFRAMEWORK)'
|
|
+ LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)$(ABIFLAGS)/$(PYTHONFRAMEWORK)'
|
|
else
|
|
# No framework. Ignore undefined symbols, assuming they come from Python
|
|
LDSHARED="$LDSHARED -undefined suppress"
|
|
@@ -13541,9 +13548,9 @@
|
|
LDCXXSHARED='$(CXX) -bundle'
|
|
if test "$enable_framework" ; then
|
|
# Link against the framework. All externals should be defined.
|
|
- BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
|
- LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
|
- LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
|
+ BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)$(ABIFLAGS)/$(PYTHONFRAMEWORK)'
|
|
+ LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)$(ABIFLAGS)/$(PYTHONFRAMEWORK)'
|
|
+ LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)$(ABIFLAGS)/$(PYTHONFRAMEWORK)'
|
|
else
|
|
# No framework, use the Python app as bundle-loader
|
|
BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
|
|
@@ -13724,7 +13731,7 @@
|
|
LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED"
|
|
|
|
if test "$enable_framework"; then
|
|
- LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
|
+ LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)$(ABIFLAGS)/$(PYTHONFRAMEWORK)'
|
|
fi
|
|
LINKFORSHARED="$LINKFORSHARED"
|
|
elif test $ac_sys_system = "iOS"; then
|