Bug 110850 – [GTK] No need to manually add system paths to jhbuildrc

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKitGTK

[Claudio Saavedra]

Tools/gtk/jhbuildrc is manually adding system dirs to PKG_CONFIG_PATH:

  # Use system libraries while building.
  if use_lib64:
      _libdir = 'lib64'
  else:
      _libdir = 'lib'
  addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', _libdir, 'pkgconfig'))
  addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', 'share', 'pkgconfig'))

First of all, addpath() seems to be /prefixing/ the path to the env. variable. This might make sense in some cases, but it doesn't when your PKG_CONFIG_PATH is already set to something sensible (for instance, if you are building WebKit from GNOME's jhbuild shell, which sets up the PKG_CONFIG_PATH to the path where GNOME has been built).

Moreover, I think this is totally unnecessary. If partial_build is True (see https://mail.gnome.org/archives/desktop-devel-list/2011-July/msg00095.html) and PKG_CONFIG_PATH is empty, Config.setup_env() is already setting  it to, at least, use the system libraries. Therefore, I think that our jhbuildrc's addpath(PKG_CONFIG, ..) calls can be safely removed.

[Claudio Saavedra]

Created attachment 190245 [details]
Patch

[Gustavo Noronha (kov)]

Comment on attachment 190245 [details]
Patch

OK, and partial_build is set to True by default, makes sense to me. Do you think this is also true of the other paths we're adding here, like the XDG ones that show up in your hunk?

[Claudio Saavedra]

Yes, it seems they are also set during initialization:

        # XDG_DATA_DIRS
        if self.partial_build:
            addpath('XDG_DATA_DIRS', '/usr/share')
        xdgdatadir = os.path.join(self.prefix, 'share')
        addpath('XDG_DATA_DIRS', xdgdatadir)

        # XDG_CONFIG_DIRS
        if self.partial_build:
            addpath('XDG_CONFIG_DIRS', '/etc')
        xdgconfigdir = os.path.join(self.prefix, 'etc', 'xdg')
        addpath('XDG_CONFIG_DIRS', xdgconfigdir)

[Claudio Saavedra]

Created attachment 190271 [details]
Patch

[Claudio Saavedra]

Committed r144628: <http://trac.webkit.org/changeset/144628>