75 lines
3.2 KiB
Diff
75 lines
3.2 KiB
Diff
|
From af4ac0284714842535106f3d5f8a973c20e95105 Mon Sep 17 00:00:00 2001
|
||
|
|
From: James Hilliard <james.hilliard1@gmail.com>
|
||
|
|
Date: Sat, 18 Jul 2020 17:01:33 -0600
|
||
|
|
Subject: [PATCH] backends: fix rpath match pattern
|
||
|
|
|
||
|
|
Since -Wl,-rpath= is not the only valid rpath ldflags syntax we
|
||
|
|
need to try and match all valid rpath ldflags.
|
||
|
|
|
||
|
|
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
|
||
|
|
[Upstream status:
|
||
|
|
https://github.com/mesonbuild/meson/pull/7472]
|
||
|
|
---
|
||
|
|
mesonbuild/backend/backends.py | 6 ++++--
|
||
|
|
run_unittests.py | 26 +++++++++++++++-----------
|
||
|
|
2 files changed, 19 insertions(+), 13 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
|
||
|
|
index cfd3a397f..6f44abc13 100644
|
||
|
|
--- a/mesonbuild/backend/backends.py
|
||
|
|
+++ b/mesonbuild/backend/backends.py
|
||
|
|
@@ -455,9 +455,11 @@ class Backend:
|
||
|
|
args.extend(self.environment.coredata.get_external_link_args(target.for_machine, lang))
|
||
|
|
except Exception:
|
||
|
|
pass
|
||
|
|
+ rpath_regex = re.compile(r'-Wl,-rpath(?:-link)?[=,]([^,@\-][^,]+)')
|
||
|
|
for arg in args:
|
||
|
|
- if arg.startswith('-Wl,-rpath='):
|
||
|
|
- for dir in arg.replace('-Wl,-rpath=','').split(':'):
|
||
|
|
+ rpath_match = rpath_regex.match(arg)
|
||
|
|
+ if rpath_match:
|
||
|
|
+ for dir in rpath_match.group(1).split(':'):
|
||
|
|
dirs.add(dir)
|
||
|
|
return dirs
|
||
|
|
|
||
|
|
diff --git a/run_unittests.py b/run_unittests.py
|
||
|
|
index 820b705b5..2c3ffc2e9 100755
|
||
|
|
--- a/run_unittests.py
|
||
|
|
+++ b/run_unittests.py
|
||
|
|
@@ -6421,17 +6421,21 @@ class LinuxlikeTests(BasePlatformTests):
|
||
|
|
self.install(use_destdir=False)
|
||
|
|
self.new_builddir()
|
||
|
|
|
||
|
|
- # Build an app that uses that installed library.
|
||
|
|
- # Supply the rpath to the installed library via LDFLAGS
|
||
|
|
- # (as systems like buildroot and guix are wont to do)
|
||
|
|
- # and verify install preserves that rpath.
|
||
|
|
- env = {'LDFLAGS': '-Wl,-rpath=' + yonder_libdir,
|
||
|
|
- 'PKG_CONFIG_PATH': os.path.join(yonder_libdir, 'pkgconfig')}
|
||
|
|
- self.init(testdir, override_envvars=env)
|
||
|
|
- self.build()
|
||
|
|
- self.install(use_destdir=False)
|
||
|
|
- got_rpath = get_rpath(os.path.join(yonder_prefix, 'bin/rpathified'))
|
||
|
|
- self.assertEqual(got_rpath, yonder_libdir)
|
||
|
|
+ # Since rpath has multiple valid formats we need to
|
||
|
|
+ # test that they are all properly used.
|
||
|
|
+ rpath_formats = ['-Wl,-rpath=', '-Wl,-rpath,', '-Wl,-rpath-link=', '-Wl,-rpath-link,']
|
||
|
|
+ for rpath_format in rpath_formats:
|
||
|
|
+ # Build an app that uses that installed library.
|
||
|
|
+ # Supply the rpath to the installed library via LDFLAGS
|
||
|
|
+ # (as systems like buildroot and guix are wont to do)
|
||
|
|
+ # and verify install preserves that rpath.
|
||
|
|
+ env = {'LDFLAGS': rpath_format + yonder_libdir,
|
||
|
|
+ 'PKG_CONFIG_PATH': os.path.join(yonder_libdir, 'pkgconfig')}
|
||
|
|
+ self.init(testdir, override_envvars=env)
|
||
|
|
+ self.build()
|
||
|
|
+ self.install(use_destdir=False)
|
||
|
|
+ got_rpath = get_rpath(os.path.join(yonder_prefix, 'bin/rpathified'))
|
||
|
|
+ self.assertEqual(got_rpath, yonder_libdir, rpath_format)
|
||
|
|
|
||
|
|
@skip_if_not_base_option('b_sanitize')
|
||
|
|
def test_pch_with_address_sanitizer(self):
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|