diff options
| author | Owen W. Taylor <otaylor@fishsoup.net> | 2012-02-23 15:14:12 -0500 |
|---|---|---|
| committer | Owen W. Taylor <otaylor@fishsoup.net> | 2012-02-23 15:14:12 -0500 |
| commit | 517075c60516a6bf49b5aa4df611065e80539835 (patch) | |
| tree | 2cae0dd59de6e23925dc54e72430a17f28520318 /tools | |
| parent | 540e970170628f81721748f9fcd875afc686e4e0 (diff) | |
| download | gnome-shell-517075c60516a6bf49b5aa4df611065e80539835.tar.gz | |
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.
Diffstat (limited to 'tools')
| -rw-r--r-- | 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 90ae34fb5..4c0c2c0b5 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. |