Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2025-01-31 11:35:24 +01:00
Code Issues Releases Wiki Activity

Force the usage of non-system libiconv on Mac.

Browse Source
This commit is contained in:
John Maguire 2011-11-07 14:48:27 +01:00
parent ea68940b76
commit 9d81fe5123
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/macdeploy.py vendored
View File

@ -166,7 +166,9 @@ def GetBrokenLibraries(binary):
continue continue
if os.path.basename(binary) in line: if os.path.basename(binary) in line:
continue 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 continue # System framework
elif re.match(r'^\s*/usr/lib/', line): elif re.match(r'^\s*/usr/lib/', line):
continue # unix style system library continue # unix style system library
@ -308,6 +310,8 @@ def FixInstallPath(library_path, library, new_path):
commands.append(args) commands.append(args)
def FindSystemLibrary(library_name): def FindSystemLibrary(library_name):
if 'iconv' in library_name:
return None
for path in ['/lib', '/usr/lib']: for path in ['/lib', '/usr/lib']:
full_path = os.path.join(path, library_name) full_path = os.path.join(path, library_name)
if os.path.exists(full_path): if os.path.exists(full_path):