mirror of
https://github.com/clementine-player/Clementine
synced 2025-01-31 03:27:40 +01:00
Force the usage of non-system libiconv on Mac.
This commit is contained in:
parent
ea68940b76
commit
9d81fe5123
8
dist/macdeploy.py
vendored
8
dist/macdeploy.py
vendored
@ -166,7 +166,9 @@ def GetBrokenLibraries(binary):
|
||||
continue
|
||||
if os.path.basename(binary) in line:
|
||||
continue
|
||||
if re.match(r'^\s*/System/', line):
|
||||
if 'libiconv' in line:
|
||||
broken_libs['libs'].append(line)
|
||||
elif re.match(r'^\s*/System/', line):
|
||||
continue # System framework
|
||||
elif re.match(r'^\s*/usr/lib/', line):
|
||||
continue # unix style system library
|
||||
@ -295,7 +297,7 @@ def FixId(path, library_name):
|
||||
id = '@executable_path/../Frameworks/%s' % library_name
|
||||
args = ['install_name_tool', '-id', id, path]
|
||||
commands.append(args)
|
||||
|
||||
|
||||
def FixLibraryId(path):
|
||||
library_name = os.path.basename(path)
|
||||
FixId(path, library_name)
|
||||
@ -308,6 +310,8 @@ def FixInstallPath(library_path, library, new_path):
|
||||
commands.append(args)
|
||||
|
||||
def FindSystemLibrary(library_name):
|
||||
if 'iconv' in library_name:
|
||||
return None
|
||||
for path in ['/lib', '/usr/lib']:
|
||||
full_path = os.path.join(path, library_name)
|
||||
if os.path.exists(full_path):
|
||||
|
Loading…
x
Reference in New Issue
Block a user