Chiebot-Mirror
/
meson
mirror of https://github.com/mesonbuild/meson.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

gnome: Do not use gir specific `--extra-lib` to generate gtkdoc args

Browse Source 
Fixes 1372
pull/1391/head
Thibault Saunier 8 years ago committed by Jussi Pakkanen
parent f3d106e786
commit 00251f16b6
1 changed files with 14 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      mesonbuild/modules/gnome.py

22
mesonbuild/modules/gnome.py
Unescape View File

@ -255,8 +255,9 @@ can not be used with the current version of glib-compiled-resources, due to
return dep_files, depends, subdirs return dep_files, depends, subdirs
def _get_link_args(self, state, lib, depends=None, include_rpath=False): def _get_link_args(self, state, lib, depends=None, include_rpath=False,
if gir_has_extra_lib_arg(): use_gir_args=False):
if gir_has_extra_lib_arg() and use_gir_args:
link_command = ['--extra-library=%s' % lib.name] link_command = ['--extra-library=%s' % lib.name]
else: else:
link_command = ['-l%s' % lib.name] link_command = ['-l%s' % lib.name]
@ -269,7 +270,8 @@ can not be used with the current version of glib-compiled-resources, due to
depends.append(lib) depends.append(lib)
return link_command return link_command
def _get_dependencies_flags(self, deps, state, depends=None, include_rpath=False): def _get_dependencies_flags(self, deps, state, depends=None, include_rpath=False,
use_gir_args=False):
cflags = set() cflags = set()
ldflags = set() ldflags = set()
gi_includes = set() gi_includes = set()
@ -283,11 +285,13 @@ can not be used with the current version of glib-compiled-resources, due to
cflags.update(get_include_args(state.environment, dep.include_directories)) cflags.update(get_include_args(state.environment, dep.include_directories))
for lib in dep.libraries: for lib in dep.libraries:
ldflags.update(self._get_link_args(state, lib.held_object, depends, include_rpath)) ldflags.update(self._get_link_args(state, lib.held_object, depends, include_rpath))
libdepflags = self._get_dependencies_flags(lib.held_object.get_external_deps(), state, depends, include_rpath) libdepflags = self._get_dependencies_flags(lib.held_object.get_external_deps(), state, depends, include_rpath,
use_gir_args)
cflags.update(libdepflags[0]) cflags.update(libdepflags[0])
ldflags.update(libdepflags[1]) ldflags.update(libdepflags[1])
gi_includes.update(libdepflags[2]) gi_includes.update(libdepflags[2])
extdepflags = self._get_dependencies_flags(dep.ext_deps, state, depends, include_rpath) extdepflags = self._get_dependencies_flags(dep.ext_deps, state, depends, include_rpath,
use_gir_args)
cflags.update(extdepflags[0]) cflags.update(extdepflags[0])
ldflags.update(extdepflags[1]) ldflags.update(extdepflags[1])
gi_includes.update(extdepflags[2]) gi_includes.update(extdepflags[2])
@ -314,7 +318,7 @@ can not be used with the current version of glib-compiled-resources, due to
# Hack to avoid passing some compiler options in # Hack to avoid passing some compiler options in
if lib.startswith("-W"): if lib.startswith("-W"):
continue continue
if gir_has_extra_lib_arg(): if gir_has_extra_lib_arg() and use_gir_args:
lib = lib.replace('-l', '--extra-library=') lib = lib.replace('-l', '--extra-library=')
ldflags.update([lib]) ldflags.update([lib])
@ -378,7 +382,8 @@ can not be used with the current version of glib-compiled-resources, due to
if not isinstance(link_with, list): if not isinstance(link_with, list):
link_with = [link_with] link_with = [link_with]
for link in link_with: for link in link_with:
scan_command += self._get_link_args(state, link.held_object, depends) scan_command += self._get_link_args(state, link.held_object, depends,
use_gir_args=True)
if 'includes' in kwargs: if 'includes' in kwargs:
includes = kwargs.pop('includes') includes = kwargs.pop('includes')
@ -478,7 +483,8 @@ can not be used with the current version of glib-compiled-resources, due to
# ldflags will be misinterpreted by gir scanner (showing # ldflags will be misinterpreted by gir scanner (showing
# spurious dependencies) but building GStreamer fails if they # spurious dependencies) but building GStreamer fails if they
# are not used here. # are not used here.
cflags, ldflags, gi_includes = self._get_dependencies_flags(deps, state, depends) cflags, ldflags, gi_includes = self._get_dependencies_flags(deps, state, depends,
use_gir_args=True)
scan_command += list(cflags) scan_command += list(cflags)
# need to put our output directory first as we need to use the # need to put our output directory first as we need to use the
# generated libraries instead of any possibly installed system/prefix # generated libraries instead of any possibly installed system/prefix

Write Preview
Loading…
Cancel
Save