[jhbuild] Run wget & curl with host environment (GNOME bug 618499)
- From: Frederic Peters <fpeters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] Run wget & curl with host environment (GNOME bug 618499)
- Date: Thu, 13 May 2010 17:36:22 +0000 (UTC)
commit e5bd9d9659f0100075ef977c3332e27efda6b652
Author: Frédéric Péters <fpeters 0d be>
Date: Thu May 13 19:35:31 2010 +0200
Run wget & curl with host environment (GNOME bug 618499)
This avoids getting curl linking against the jhbuild'ed nss, and failing on
unknown symbols.
jhbuild/versioncontrol/tarball.py | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/jhbuild/versioncontrol/tarball.py b/jhbuild/versioncontrol/tarball.py
index 53095a7..b00b7c3 100644
--- a/jhbuild/versioncontrol/tarball.py
+++ b/jhbuild/versioncontrol/tarball.py
@@ -206,10 +206,16 @@ class TarballBranch(Branch):
# don't have the tarball, try downloading it and check again
if has_command('wget'):
res = buildscript.execute(
- ['wget', '--continue', self.module, '-O', localfile])
+ ['wget', '--continue', self.module, '-O', localfile],
+ extra_env={
+ 'LD_LIBRARY_PATH': os.environ.get('UNMANGLED_LD_LIBRARY_PATH'),
+ 'PATH': os.environ.get('UNMANGLED_PATH')})
elif has_command('curl'):
res = buildscript.execute(
- ['curl', '--continue-at', '-', '-L', self.module, '-o', localfile])
+ ['curl', '--continue-at', '-', '-L', self.module, '-o', localfile],
+ extra_env={
+ 'LD_LIBRARY_PATH': os.environ.get('UNMANGLED_LD_LIBRARY_PATH'),
+ 'PATH': os.environ.get('UNMANGLED_PATH')})
else:
raise FatalError(_("unable to find wget or curl"))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]