summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@gmail.com>2020-06-11 16:01:02 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-15 14:53:45 +0100
commit4928ceba19d1253d5e21d9b18934c607df31ef1d (patch)
tree1d7b7175a8149341aa8359467d4fe2a0a26328ff
parent81ce5b6c836b2c0155d65bba92b5f90223400fe0 (diff)
downloadpoky-4928ceba19d1253d5e21d9b18934c607df31ef1d.tar.gz
meson: backport library ordering fix
meson had a bug where they started looking for static boost libraries first vs. the default behavior of looking at shared libraries first. This caused issues because some projects assume the shared libraries first which automatically add in other shared library dependencies. Static libraries do not have the default behavior so projects that use boost start failing to compile with undefined references to other boost libraries. (From OE-Core rev: 17d1d8de8c4d50d42882586244ae5eef3a111a3c) Signed-off-by: Andrew Geissler <geissonator@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/meson/meson.inc1
-rw-r--r--meta/recipes-devtools/meson/meson/0001-boost-Always-sort-shared-before-static-fixes-7171.patch35
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index 12bc08648a..a0b54f57db 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -15,6 +15,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
15 file://cross-prop-default.patch \ 15 file://cross-prop-default.patch \
16 file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ 16 file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
17 file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \ 17 file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \
18 file://0001-boost-Always-sort-shared-before-static-fixes-7171.patch \
18 " 19 "
19SRC_URI[sha256sum] = "a7716eeae8f8dff002e4147642589ab6496ff839e4376a5aed761f83c1fa0455" 20SRC_URI[sha256sum] = "a7716eeae8f8dff002e4147642589ab6496ff839e4376a5aed761f83c1fa0455"
20 21
diff --git a/meta/recipes-devtools/meson/meson/0001-boost-Always-sort-shared-before-static-fixes-7171.patch b/meta/recipes-devtools/meson/meson/0001-boost-Always-sort-shared-before-static-fixes-7171.patch
new file mode 100644
index 0000000000..217218180e
--- /dev/null
+++ b/meta/recipes-devtools/meson/meson/0001-boost-Always-sort-shared-before-static-fixes-7171.patch
@@ -0,0 +1,35 @@
1From 5862ad6965c60caa861dfdcd29e499c34c4d00da Mon Sep 17 00:00:00 2001
2From: Daniel Mensinger <daniel@mensinger-ka.de>
3Date: Thu, 21 May 2020 13:35:27 +0200
4Subject: [PATCH] boost: Always sort shared before static (fixes #7171)
5
6Upstream-Status: Backport [https://github.com/mesonbuild/meson/commit/5862ad6965c60caa861dfdcd29e499c34c4d00da]
7
8Signed-off-by: Andrew Geissler <geissonator@gmail.com>
9---
10 mesonbuild/dependencies/boost.py | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py
14index 6e85c534..38497041 100644
15--- a/mesonbuild/dependencies/boost.py
16+++ b/mesonbuild/dependencies/boost.py
17@@ -189,13 +189,13 @@ class BoostLibraryFile():
18 def __lt__(self, other: T.Any) -> bool:
19 if isinstance(other, BoostLibraryFile):
20 return (
21- self.mod_name, self.version_lib, self.arch, self.static,
22+ self.mod_name, self.static, self.version_lib, self.arch,
23 not self.mt, not self.runtime_static,
24 not self.debug, self.runtime_debug, self.python_debug,
25 self.stlport, self.deprecated_iostreams,
26 self.name,
27 ) < (
28- other.mod_name, other.version_lib, other.arch, other.static,
29+ other.mod_name, other.static, other.version_lib, other.arch,
30 not other.mt, not other.runtime_static,
31 not other.debug, other.runtime_debug, other.python_debug,
32 other.stlport, other.deprecated_iostreams,
33--
342.26.2
35