From 8380c3be02726c68d30bdcb7262bf1655f4d4558 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Wed, 26 Oct 2016 10:40:19 +0200
Subject: [PATCH] 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.
---
android/build.py | 2 ++
python/build/autotools.py | 1 +
python/build/ffmpeg.py | 1 +
win32/build.py | 2 ++
4 files changed, 6 insertions(+)
diff --git a/android/build.py b/android/build.py
index 18f80ca88..5d0a9954a 100755
--- a/android/build.py
+++ b/android/build.py
@@ -78,6 +78,7 @@ class AndroidNdkToolchain:
self.cxx = os.path.join(toolchain_bin, arch + '-g++')
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.strip = os.path.join(toolchain_bin, arch + '-strip')
@@ -142,6 +143,7 @@ configure = [
'LDFLAGS=' + toolchain.ldflags,
'LIBS=' + toolchain.libs,
'AR=' + toolchain.ar,
+ 'RANLIB=' + toolchain.ranlib,
'STRIP=' + toolchain.strip,
'--host=' + toolchain.arch,
'--prefix=' + toolchain.install_prefix,
diff --git a/python/build/autotools.py b/python/build/autotools.py
index 56b4ede59..d9a1f156b 100644
--- a/python/build/autotools.py
+++ b/python/build/autotools.py
@@ -32,6 +32,7 @@ class AutotoolsProject(Project):
'LDFLAGS=' + toolchain.ldflags,
'LIBS=' + toolchain.libs,
'AR=' + toolchain.ar,
+ 'RANLIB=' + toolchain.ranlib,
'STRIP=' + toolchain.strip,
'--host=' + toolchain.arch,
'--prefix=' + toolchain.install_prefix,
diff --git a/python/build/ffmpeg.py b/python/build/ffmpeg.py
index b3ed215a2..1a5ec3d5f 100644
--- a/python/build/ffmpeg.py
+++ b/python/build/ffmpeg.py
@@ -34,6 +34,7 @@ class FfmpegProject(Project):
'--extra-ldflags=' + toolchain.ldflags,
'--extra-libs=' + toolchain.libs,
'--ar=' + toolchain.ar,
+ '--ranlib=' + toolchain.ranlib,
'--enable-cross-compile',
'--arch=' + arch,
'--target-os=' + target_os,
diff --git a/win32/build.py b/win32/build.py
index 0914d78f7..36bfcd8e3 100755
--- a/win32/build.py
+++ b/win32/build.py
@@ -35,6 +35,7 @@ class CrossGccToolchain:
self.cc = os.path.join(toolchain_bin, arch + '-gcc')
self.cxx = os.path.join(toolchain_bin, arch + '-g++')
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.strip = os.path.join(toolchain_bin, arch + '-strip')
@@ -89,6 +90,7 @@ configure = [
'LDFLAGS=' + toolchain.ldflags + ' -static',
'LIBS=' + toolchain.libs,
'AR=' + toolchain.ar,
+ 'RANLIB=' + toolchain.ranlib,
'STRIP=' + toolchain.strip,
'--host=' + toolchain.arch,
'--prefix=' + toolchain.install_prefix,