[jhbuild] meson: refresh patch
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] meson: refresh patch
- Date: Tue, 4 Feb 2020 14:05:40 +0000 (UTC)
commit 6e6404f49fdb3a8342f1d2fb10142abb3c3499cb
Author: Christoph Reiter <reiter christoph gmail com>
Date: Tue Feb 4 13:40:08 2020 +0100
meson: refresh patch
Maybe it helps with #56
patches/meson-dont-use-rpath-on-pkg-config-deps.patch | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/patches/meson-dont-use-rpath-on-pkg-config-deps.patch
b/patches/meson-dont-use-rpath-on-pkg-config-deps.patch
index b2f7bcc2..e73af38d 100644
--- a/patches/meson-dont-use-rpath-on-pkg-config-deps.patch
+++ b/patches/meson-dont-use-rpath-on-pkg-config-deps.patch
@@ -1,8 +1,7 @@
-From 24eb4c9248c34f482a9a1d166f779d91456ac536 Mon Sep 17 00:00:00 2001
+From 34685678f91ab89f74820c0fb58cc3c2a46cf8cc Mon Sep 17 00:00:00 2001
From: Ting-Wei Lan <lantw src gnome org>
Date: Thu, 4 Oct 2018 23:03:30 +0800
-Subject: [PATCH 1/2] backends: Use raw_link_args to check for the need of
- RPATH
+Subject: [PATCH] backends: Use raw_link_args to check for the need of RPATH
Function rpaths_for_bundled_shared_libraries assumes it needs RPATH when
linking arguments of an external dependency has exactly one argument and
@@ -32,10 +31,10 @@ Works around https://github.com/mesonbuild/meson/issues/4270.
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
-index 4d3f5d9b..6d39e1cb 100644
+index 2a07058a..564ceb3e 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
-@@ -402,7 +402,7 @@ class Backend:
+@@ -403,7 +403,7 @@ class Backend:
for dep in target.external_deps:
if not isinstance(dep, (dependencies.ExternalLibrary, dependencies.PkgConfigDependency)):
continue
@@ -45,10 +44,10 @@ index 4d3f5d9b..6d39e1cb 100644
continue
# The only link argument is an absolute path to a library file.
diff --git a/run_unittests.py b/run_unittests.py
-index bfd7a546..29226fa9 100755
+index 676604f4..17cb94ff 100755
--- a/run_unittests.py
+++ b/run_unittests.py
-@@ -5680,7 +5680,7 @@ c = ['{0}']
+@@ -5910,7 +5910,7 @@ c = ['{0}']
# Test that installed libraries works
self.new_builddir()
self.prefix = oldprefix
@@ -58,5 +57,5 @@ index bfd7a546..29226fa9 100755
testdir = os.path.join(self.unit_test_dir, '69 static link')
env = {'PKG_CONFIG_LIBDIR': os.path.join(libdir, 'pkgconfig')}
--
-2.23.0
+2.25.0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]