From 927071e08511442604e7514aac8399229f722b63 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 9 Feb 2018 22:57:31 +0100 Subject: [PATCH] python/build/project.py: add quilt support --- python/build/project.py | 9 +++++++++ python/build/quilt.py | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 python/build/quilt.py diff --git a/python/build/project.py b/python/build/project.py index 352806fcb..b78c89238 100644 --- a/python/build/project.py +++ b/python/build/project.py @@ -3,10 +3,12 @@ import re from build.download import download_and_verify from build.tar import untar +from build.quilt import push_all class Project: def __init__(self, url, md5, installed, name=None, version=None, base=None, + patches=None, edits=None, use_cxx=False): if base is None: @@ -29,6 +31,10 @@ class Project: self.md5 = md5 self.installed = installed + if patches is not None: + srcdir = os.path.dirname(os.path.dirname(os.path.dirname(__file__))) + patches = os.path.join(srcdir, patches) + self.patches = patches self.edits = edits self.use_cxx = use_cxx @@ -51,6 +57,9 @@ class Project: parent_path = toolchain.build_path path = untar(self.download(toolchain), parent_path, self.base) + if self.patches is not None: + push_all(toolchain, path, self.patches) + if self.edits is not None: for filename, function in self.edits.items(): with open(os.path.join(path, filename), 'r+t') as f: diff --git a/python/build/quilt.py b/python/build/quilt.py new file mode 100644 index 000000000..876453d2b --- /dev/null +++ b/python/build/quilt.py @@ -0,0 +1,9 @@ +import subprocess + +def run_quilt(toolchain, cwd, patches_path, *args): + env = dict(toolchain.env) + env['QUILT_PATCHES'] = patches_path + subprocess.check_call(['quilt'] + list(args), cwd=cwd, env=env) + +def push_all(toolchain, src_path, patches_path): + run_quilt(toolchain, src_path, patches_path, 'push', '-a')