[gnome-shell] jhbuildrc-gnome-shell: remove versioned-xulrunner-directories workaround
- From: Owen Taylor <otaylor src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] jhbuildrc-gnome-shell: remove versioned-xulrunner-directories workaround
- Date: Thu, 23 Feb 2012 20:15:32 +0000 (UTC)
commit 517075c60516a6bf49b5aa4df611065e80539835
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Thu Feb 23 15:14:12 2012 -0500
jhbuildrc-gnome-shell: remove versioned-xulrunner-directories workaround
Since we require libmozjs185, we no longer have to play tricks with
pkg-config in our jhbuildrc.
tools/build/jhbuildrc-gnome-shell | 17 -----------------
1 files changed, 0 insertions(+), 17 deletions(-)
---
diff --git a/tools/build/jhbuildrc-gnome-shell b/tools/build/jhbuildrc-gnome-shell
index 90ae34f..4c0c2c0 100644
--- a/tools/build/jhbuildrc-gnome-shell
+++ b/tools/build/jhbuildrc-gnome-shell
@@ -41,23 +41,6 @@ addpath('XDG_DATA_DIRS', '/usr/share')
# Look in /etc/xdg for system-global autostart files
addpath('XDG_CONFIG_DIRS', '/etc/xdg')
-#
-# For Ubuntu Intrepid, libmozjs lives in /usr/lib/xulrunner-<version>
-# However, that path isn't in ld.so.conf, meaning that it's basically
-# impossible to use the xulrunner .pc files and libraries. Work around
-# this by deriving the path and adding it to LD_LIBRARY_PATH ourself.
-#
-import re
-import subprocess
-_pkgconfig = subprocess.Popen(['pkg-config', '--variable=sdkdir', 'mozilla-js'],
- stdout=subprocess.PIPE)
-_sdkdir = _pkgconfig.communicate()[0].strip()
-_pkgconfig.wait()
-if _pkgconfig.returncode == 0:
- _libdir = re.sub('-(sdk|devel)', '', _sdkdir)
- if os.path.exists(_libdir + '/libmozjs.so'):
- addpath('LD_LIBRARY_PATH', _libdir)
-
# Import optional user RC for further customization. You can override
# the prefix or default build setup for example, or CFLAGS or
# module_autogenargs, etc.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]