Merge pull request #2275 from Kazzz-S/0.30.6-mac1

Minor changes in the macOS build system
This commit is contained in:
Matthias Köfferlein 2026-02-26 22:05:01 +01:00 committed by GitHub
commit 5c26821d1f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 2 deletions

View File

@ -1991,7 +1991,25 @@ def Deploy_Binaries_For_Bundle(config, parameters):
cmd06 = "rm -rf %s" % binTarget
cmd07 = "mkdir %s" % sitepackagesTarget
cmd08 = "cp -RL %s/{*distutils*,pip*,pkg_resources,setuptools*,wheel*} %s" % (sitepackagesSource, sitepackagesTarget)
# cmd08 = "cp -RL %s/{*distutils*,pip*,pkg_resources,setuptools*,wheel*} %s" % (sitepackagesSource, sitepackagesTarget)
# Updated for compatibility with modern Python environments (e.g., pip 26.0.1+).
# Since 'pkg_resources' and other legacy paths may be absent in recent setuptools,
# we use a loop to copy only available directories while suppressing errors.
# Define patterns for essential packages to be bundled
patterns = ['*distutils*', 'pip*', 'pkg_resources*', 'setuptools*', 'wheel*']
sources = []
# Collect only existing paths to avoid "No such file or directory" errors,
# especially for 'pkg_resources' which is deprecated and often missing in Python 3.11+.
for p in patterns:
sources.extend(glob.glob(os.path.join(sitepackagesSource, p)))
if sources:
# Join all existing paths into a single string for the 'cp' command
cmd08 = "cp -RL %s %s" % (" ".join(sources), sitepackagesTarget)
else:
# Fallback or log if no packages are found
cmd08 = "echo 'No matching site-packages found to copy; skipping.'"
shell_commands = list()
shell_commands.append(cmd01)

View File

@ -328,7 +328,7 @@ RubyTahoe = { 'exe': '/System/Library/Frameworks/Ruby.framework/Versions
# install with 'sudo port install ruby34'
# [Key Type Name] = 'MP34'
Ruby34MacPorts = { 'exe': '/opt/local/bin/ruby3.4',
'inc': '/opt/local/include/ruby-3.4.7',
'inc': '/opt/local/include/ruby-3.4.8',
'lib': '/opt/local/lib/libruby.3.4.dylib'
}