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.
This commit is contained in:
parent
540e970170
commit
517075c605
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user