mirror of
https://github.com/clementine-player/Clementine
synced 2025-01-18 20:40:43 +01:00
Mac deployment fix to prefer system libraries to equivalent fink versions.
This commit is contained in:
parent
821baa2211
commit
505bace684
17
macdeploy.py
17
macdeploy.py
@ -224,7 +224,7 @@ def FixFramework(path):
|
|||||||
FixLibraryInstallPath(library, new_path)
|
FixLibraryInstallPath(library, new_path)
|
||||||
|
|
||||||
def FixLibrary(path):
|
def FixLibrary(path):
|
||||||
if path in fixed_libraries:
|
if path in fixed_libraries or FindSystemLibrary(os.path.basename(path)) is not None:
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
fixed_libraries.append(path)
|
fixed_libraries.append(path)
|
||||||
@ -299,9 +299,20 @@ def FixInstallPath(library_path, library, new_path):
|
|||||||
args = ['install_name_tool', '-change', library_path, new_path, library]
|
args = ['install_name_tool', '-change', library_path, new_path, library]
|
||||||
commands.append(args)
|
commands.append(args)
|
||||||
|
|
||||||
|
def FindSystemLibrary(library_name):
|
||||||
|
for path in ['/lib', '/usr/lib']:
|
||||||
|
full_path = os.path.join(path, library_name)
|
||||||
|
if os.path.exists(full_path):
|
||||||
|
return full_path
|
||||||
|
return None
|
||||||
|
|
||||||
def FixLibraryInstallPath(library_path, library):
|
def FixLibraryInstallPath(library_path, library):
|
||||||
new_path = '@executable_path/../Frameworks/%s' % os.path.basename(library_path)
|
system_library = FindSystemLibrary(os.path.basename(library_path))
|
||||||
FixInstallPath(library_path, library, new_path)
|
if system_library is None:
|
||||||
|
new_path = '@executable_path/../Frameworks/%s' % os.path.basename(library_path)
|
||||||
|
FixInstallPath(library_path, library, new_path)
|
||||||
|
else:
|
||||||
|
FixInstallPath(library_path, library, system_library)
|
||||||
|
|
||||||
def FixFrameworkInstallPath(library_path, library):
|
def FixFrameworkInstallPath(library_path, library):
|
||||||
parts = library_path.split(os.sep)
|
parts = library_path.split(os.sep)
|
||||||
|
Loading…
Reference in New Issue
Block a user