Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Silbe <silbe@sugarlabs.org>2011-08-22 11:14:17 (GMT)
committer Sascha Silbe <silbe@sugarlabs.org>2011-08-22 11:14:17 (GMT)
commit5923202d300b0441cfb39a55a78a6513b0126771 (patch)
treee7d55c1ade824114ba70bc4a0b5952eb2ebed4e9
parent3c5dd38a921988286eeee455f18401af2da55df9 (diff)
Work around upstream jhbuild requiring DESTDIR support (SL#2980)HEADmaster
Upstream decided to fail hard on modules that don't support DESTDIR (Gnome#654592), but sugar.activity.bundlebuilder doesn't support DESTDIR yet (SL#2947). Signed-off-by: Sascha Silbe <silbe@sugarlabs.org>
-rw-r--r--sjhbuild/bundlemodule.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/sjhbuild/bundlemodule.py b/sjhbuild/bundlemodule.py
index 3f9ec0c..bc50227 100644
--- a/sjhbuild/bundlemodule.py
+++ b/sjhbuild/bundlemodule.py
@@ -41,7 +41,9 @@ class BundleModule(distutils.DistutilsModule):
cmd.extend(['install',
'--prefix', buildscript.config.prefix])
buildscript.execute(cmd, cwd = srcdir, extra_env = self.extra_env)
- self.process_install(buildscript, self.get_revision())
+ # sugar.activity.bundlebuilder doesn't support --root (SL#2947)
+# self.process_install(buildscript, self.get_revision())
+ do_install.depends = [distutils.DistutilsModule.PHASE_BUILD]
def parse_bundle(node, config, uri, repositories, default_repo):