--- configure.orig 2024-12-04 04:59:52 +++ configure 2025-01-04 01:01:47 @@ -4354,7 +4354,9 @@ ;; esac - prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION + ABIFLAGS="@@ABIFLAGS@@" + prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/${VERSION}${ABIFLAGS} + FRAMEWORKINSTALLAPPSPREFIX="@@APPLICATIONS_DIR@@" PYTHONFRAMEWORKINSTALLNAMEPREFIX=${prefix} RESSRCDIR=Mac/Resources/framework @@ -7549,7 +7551,7 @@ then case $ac_sys_system in Darwin) - LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)';; + LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)$(ABIFLAGS)/$(PYTHONFRAMEWORK)';; iOS) LDLIBRARY='$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)';; *) @@ -8438,7 +8440,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 "${CC}" = "clang" then clang_bin=`which clang` @@ -10259,6 +10261,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 @@ -12913,9 +12920,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" @@ -12926,9 +12933,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)' @@ -13109,7 +13116,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