brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jhbuildrc-gnome-shell: remove versioned-xulrunner-directories workaround

Browse Source 
Since we require libmozjs185, we no longer have to play tricks with
pkg-config in our jhbuildrc.
This commit is contained in:
Owen W. Taylor 2012-02-23 15:14:12 -05:00
parent 540e970170
commit 517075c605
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/build/jhbuildrc-gnome-shell
View File

@ -41,23 +41,6 @@ addpath('XDG_DATA_DIRS', '/usr/share')
# Look in /etc/xdg for system-global autostart files # Look in /etc/xdg for system-global autostart files
addpath('XDG_CONFIG_DIRS', '/etc/xdg') 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 # Import optional user RC for further customization. You can override
# the prefix or default build setup for example, or CFLAGS or # the prefix or default build setup for example, or CFLAGS or
# module_autogenargs, etc. # module_autogenargs, etc.