oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

python/build/autotools: pass RANLIB to configure 

Fixes various static library linker failures ("bad extended name entry
at header"), because the wrong "ranlib" was used.
This commit is contained in:
Max Kellermann 2016-10-26 10:40:19 +02:00
parent 6470bcda19
commit 8380c3be02
4 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/build.py
View File

@ -78,6 +78,7 @@ class AndroidNdkToolchain:
self.cxx = os.path.join(toolchain_bin, arch + '-g++') self.cxx = os.path.join(toolchain_bin, arch + '-g++')
self.ar = os.path.join(toolchain_bin, arch + '-ar') self.ar = os.path.join(toolchain_bin, arch + '-ar')
self.ranlib = os.path.join(toolchain_bin, arch + '-ranlib')
self.nm = os.path.join(toolchain_bin, arch + '-nm') self.nm = os.path.join(toolchain_bin, arch + '-nm')
self.strip = os.path.join(toolchain_bin, arch + '-strip') self.strip = os.path.join(toolchain_bin, arch + '-strip')
@ -142,6 +143,7 @@ configure = [
'LDFLAGS=' + toolchain.ldflags, 'LDFLAGS=' + toolchain.ldflags,
'LIBS=' + toolchain.libs, 'LIBS=' + toolchain.libs,
'AR=' + toolchain.ar, 'AR=' + toolchain.ar,
'RANLIB=' + toolchain.ranlib,
'STRIP=' + toolchain.strip, 'STRIP=' + toolchain.strip,
'--host=' + toolchain.arch, '--host=' + toolchain.arch,
'--prefix=' + toolchain.install_prefix, '--prefix=' + toolchain.install_prefix,

1
python/build/autotools.py
View File

@ -32,6 +32,7 @@ class AutotoolsProject(Project):
'LDFLAGS=' + toolchain.ldflags, 'LDFLAGS=' + toolchain.ldflags,
'LIBS=' + toolchain.libs, 'LIBS=' + toolchain.libs,
'AR=' + toolchain.ar, 'AR=' + toolchain.ar,
'RANLIB=' + toolchain.ranlib,
'STRIP=' + toolchain.strip, 'STRIP=' + toolchain.strip,
'--host=' + toolchain.arch, '--host=' + toolchain.arch,
'--prefix=' + toolchain.install_prefix, '--prefix=' + toolchain.install_prefix,

1
python/build/ffmpeg.py
View File

@ -34,6 +34,7 @@ class FfmpegProject(Project):
'--extra-ldflags=' + toolchain.ldflags, '--extra-ldflags=' + toolchain.ldflags,
'--extra-libs=' + toolchain.libs, '--extra-libs=' + toolchain.libs,
'--ar=' + toolchain.ar, '--ar=' + toolchain.ar,
'--ranlib=' + toolchain.ranlib,
'--enable-cross-compile', '--enable-cross-compile',
'--arch=' + arch, '--arch=' + arch,
'--target-os=' + target_os, '--target-os=' + target_os,

2
win32/build.py
View File

@ -35,6 +35,7 @@ class CrossGccToolchain:
self.cc = os.path.join(toolchain_bin, arch + '-gcc') self.cc = os.path.join(toolchain_bin, arch + '-gcc')
self.cxx = os.path.join(toolchain_bin, arch + '-g++') self.cxx = os.path.join(toolchain_bin, arch + '-g++')
self.ar = os.path.join(toolchain_bin, arch + '-ar') self.ar = os.path.join(toolchain_bin, arch + '-ar')
self.ranlib = os.path.join(toolchain_bin, arch + '-ranlib')
self.nm = os.path.join(toolchain_bin, arch + '-nm') self.nm = os.path.join(toolchain_bin, arch + '-nm')
self.strip = os.path.join(toolchain_bin, arch + '-strip') self.strip = os.path.join(toolchain_bin, arch + '-strip')
@ -89,6 +90,7 @@ configure = [
'LDFLAGS=' + toolchain.ldflags + ' -static', 'LDFLAGS=' + toolchain.ldflags + ' -static',
'LIBS=' + toolchain.libs, 'LIBS=' + toolchain.libs,
'AR=' + toolchain.ar, 'AR=' + toolchain.ar,
'RANLIB=' + toolchain.ranlib,
'STRIP=' + toolchain.strip, 'STRIP=' + toolchain.strip,
'--host=' + toolchain.arch, '--host=' + toolchain.arch,
'--prefix=' + toolchain.install_prefix, '--prefix=' + toolchain.install_prefix,