{android,win32}/build.py: move Toolchain classes to python/build/toolchain.py

win32/build.py

@@ -29,67 +29,12 @@ sys.path[0] = os.path.join(mpd_path, 'python')
 
 # output directories
 from build.dirs import lib_path, tarball_path, src_path
+from build.toolchain import MingwToolchain
 
 arch_path = os.path.join(lib_path, host_arch)
 build_path = os.path.join(arch_path, 'build')
 root_path = os.path.join(arch_path, 'root')
 
-class MingwToolchain:
-    def __init__(self, top_path: str,
-                 toolchain_path, arch, x64: bool,
-                 tarball_path, src_path, build_path, install_prefix):
-        self.arch = arch
-        self.actual_arch = arch
-        self.tarball_path = tarball_path
-        self.src_path = src_path
-        self.build_path = build_path
-        self.install_prefix = install_prefix
-
-        toolchain_bin = os.path.join(toolchain_path, 'bin')
-        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.arflags = 'rcs'
-        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')
-        self.windres = os.path.join(toolchain_bin, arch + '-windres')
-
-        common_flags = '-O2 -g'
-
-        if not x64:
-            # enable SSE support which is required for LAME
-            common_flags += ' -march=pentium3'
-
-        self.cflags = common_flags
-        self.cxxflags = common_flags
-        self.cppflags = '-isystem ' + os.path.join(install_prefix, 'include') + \
-                        ' -DWINVER=0x0600 -D_WIN32_WINNT=0x0600'
-        self.ldflags = '-L' + os.path.join(install_prefix, 'lib') + \
-                       ' -static-libstdc++ -static-libgcc'
-        self.libs = ''
-
-        # Explicitly disable _FORTIFY_SOURCE because it is broken with
-        # mingw.  This prevents some libraries such as libFLAC to
-        # enable it.
-        self.cppflags += ' -D_FORTIFY_SOURCE=0'
-
-        self.is_arm = arch.startswith('arm')
-        self.is_armv7 = self.is_arm and 'armv7' in self.cflags
-        self.is_aarch64 = arch == 'aarch64'
-        self.is_windows = 'mingw32' in arch
-
-        self.env = dict(os.environ)
-
-        # redirect pkg-config to use our root directory instead of the
-        # default one on the build host
-        import shutil
-        bin_dir = os.path.join(install_prefix, 'bin')
-        os.makedirs(bin_dir, exist_ok=True)
-        self.pkg_config = shutil.copy(os.path.join(top_path, 'build', 'pkg-config.sh'),
-                                      os.path.join(bin_dir, 'pkg-config'))
-        self.env['PKG_CONFIG'] = self.pkg_config
-
 # a list of third-party libraries to be used by MPD on Android
 from build.libs import *
 thirdparty_libs = [