pkgconfig deps: Also resolve paths to shared libraries

This allows us to more aggressively de-dup them, and also sets RPATHs
to all libraries that are not in the system linker paths so that
binaries can be run uninstalled without any special steps.

These RPATHs will be wiped on install, so they do not affect
reproducible builds.

De-duping:
Fixes https://github.com/mesonbuild/meson/issues/2150
Fixes https://github.com/mesonbuild/meson/issues/2118
Fixes https://github.com/mesonbuild/meson/issues/3071

RPATHs:
Fixes https://github.com/mesonbuild/meson/issues/314
Fixes https://github.com/mesonbuild/meson/issues/2881

Also fixes the uninstalled usage portions of:
https://github.com/mesonbuild/meson/issues/3038
https://github.com/mesonbuild/meson/issues/3077
pull/3750/head
Nirbheek Chauhan 7 years ago committed by Nirbheek Chauhan
parent 5467eed186
commit e3757e3d3c
  1. 3
      mesonbuild/compilers/c.py
  2. 63
      mesonbuild/dependencies/base.py

@ -843,7 +843,7 @@ class CCompiler(Compiler):
# First try if we can just add the library as -l. # First try if we can just add the library as -l.
# Gcc + co seem to prefer builtin lib dirs to -L dirs. # Gcc + co seem to prefer builtin lib dirs to -L dirs.
# Only try to find std libs if no extra dirs specified. # Only try to find std libs if no extra dirs specified.
if not extra_dirs and libtype == 'default': if not extra_dirs:
args = ['-l' + libname] args = ['-l' + libname]
if self.links(code, env, extra_args=args): if self.links(code, env, extra_args=args):
return args return args
@ -861,6 +861,7 @@ class CCompiler(Compiler):
trial = os.path.join(d, prefix + libname + '.' + suffix) trial = os.path.join(d, prefix + libname + '.' + suffix)
if os.path.isfile(trial): if os.path.isfile(trial):
return [trial] return [trial]
# XXX: For OpenBSD and macOS we (may) need to search for libfoo.x.y.z.dylib
return None return None
def find_library_impl(self, libname, env, extra_dirs, code, libtype): def find_library_impl(self, libname, env, extra_dirs, code, libtype):

@ -27,9 +27,8 @@ from pathlib import PurePath
from .. import mlog from .. import mlog
from .. import mesonlib from .. import mesonlib
from ..mesonlib import ( from ..mesonlib import MesonException, OrderedSet
MesonException, Popen_safe, version_compare_many, version_compare, listify from ..mesonlib import Popen_safe, version_compare_many, version_compare, listify
)
# These must be defined in this file to avoid cyclical references. # These must be defined in this file to avoid cyclical references.
@ -587,30 +586,49 @@ class PkgConfigDependency(ExternalDependency):
if ret != 0: if ret != 0:
raise DependencyException('Could not generate libs for %s:\n\n%s' % raise DependencyException('Could not generate libs for %s:\n\n%s' %
(self.name, out)) (self.name, out))
self.link_args = [] # These libraries should be safe to de-dup
libpaths = [] link_args = OrderedSet()
static_libs_notfound = [] libpaths = OrderedSet()
libs_notfound = []
libtype = 'static' if self.static else 'default'
# We always look for the file ourselves instead of depending on the
# compiler to find it with -lfoo or foo.lib (if possible) because:
# 1. We want to be able to select static or shared
# 2. We need the full path of the library to calculate RPATH values
#
# Libraries that are provided by the toolchain or are not found by
# find_library() will be added with -L -l pairs.
for lib in self._convert_mingw_paths(shlex.split(out)): for lib in self._convert_mingw_paths(shlex.split(out)):
# If we want to use only static libraries, we have to look for the
# file ourselves instead of depending on the compiler to find it
# with -lfoo or foo.lib. However, we can only do this if we already
# have some library paths gathered.
if self.static:
if lib.startswith('-L'): if lib.startswith('-L'):
libpaths.append(lib[2:]) libpaths.add(lib[2:])
continue continue
# FIXME: try to handle .la files in static mode too?
elif lib.startswith('-l'): elif lib.startswith('-l'):
args = self.compiler.find_library(lib[2:], self.env, libpaths, libtype='static') if self.compiler:
if not args or len(args) < 1: args = self.compiler.find_library(lib[2:], self.env,
if lib in static_libs_notfound: list(libpaths), libtype)
# If no compiler is set on the dependency, the project only
# uses a non-clike language such as Rust, C#, Python, etc. In
# this case, all we can do is limp along.
else:
args = None
if args:
# Replace -l arg with full path to library if available
if not args[0].startswith('-l'):
lib = args[0]
# else, library is provided by the compiler and can't be resolved
else:
# Library wasn't found, maybe we're looking in the wrong
# places or the library will be provided with LDFLAGS or
# LIBRARY_PATH from the environment (on macOS), and many
# other edge cases that we can't account for.
#
# Add all -L paths and use it as -lfoo
if lib in libs_notfound:
continue continue
if self.static:
mlog.warning('Static library {!r} not found for dependency {!r}, may ' mlog.warning('Static library {!r} not found for dependency {!r}, may '
'not be statically linked'.format(lib[2:], self.name)) 'not be statically linked'.format(lib[2:], self.name))
static_libs_notfound.append(lib) libs_notfound.append(lib)
else:
# Replace -l arg with full path to static library
lib = args[0]
elif lib.endswith(".la"): elif lib.endswith(".la"):
shared_libname = self.extract_libtool_shlib(lib) shared_libname = self.extract_libtool_shlib(lib)
shared_lib = os.path.join(os.path.dirname(lib), shared_libname) shared_lib = os.path.join(os.path.dirname(lib), shared_libname)
@ -623,9 +641,10 @@ class PkgConfigDependency(ExternalDependency):
'library path' % lib) 'library path' % lib)
lib = shared_lib lib = shared_lib
self.is_libtool = True self.is_libtool = True
self.link_args.append(lib) link_args.add(lib)
self.link_args = list(link_args)
# Add all -Lbar args if we have -lfoo args in link_args # Add all -Lbar args if we have -lfoo args in link_args
if static_libs_notfound: if libs_notfound:
# Order of -L flags doesn't matter with ld, but it might with other # Order of -L flags doesn't matter with ld, but it might with other
# linkers such as MSVC, so prepend them. # linkers such as MSVC, so prepend them.
self.link_args = ['-L' + lp for lp in libpaths] + self.link_args self.link_args = ['-L' + lp for lp in libpaths] + self.link_args

Loading…
Cancel
Save