From 32654a436bd7904c10204251299a50cac55df0fb Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 11 Jun 2020 15:44:54 -0500 Subject: 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. The patch was initially put into the meta-phosphor layer as a bbappend but it really should be a backport from oe-core upstream. This commit backports the upstream fix and removes the meta-phosphor patch. Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler Change-Id: Id50eb02fa8ad519903498ace2ef825d55fa1b033 --- poky/meta/recipes-devtools/meson/meson.inc | 1 + ...ways-sort-shared-before-static-fixes-7171.patch | 35 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 poky/meta/recipes-devtools/meson/meson/0001-boost-Always-sort-shared-before-static-fixes-7171.patch (limited to 'poky') diff --git a/poky/meta/recipes-devtools/meson/meson.inc b/poky/meta/recipes-devtools/meson/meson.inc index 12bc08648..a0b54f57d 100644 --- a/poky/meta/recipes-devtools/meson/meson.inc +++ b/poky/meta/recipes-devtools/meson/meson.inc @@ -15,6 +15,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://cross-prop-default.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \ + file://0001-boost-Always-sort-shared-before-static-fixes-7171.patch \ " SRC_URI[sha256sum] = "a7716eeae8f8dff002e4147642589ab6496ff839e4376a5aed761f83c1fa0455" diff --git a/poky/meta/recipes-devtools/meson/meson/0001-boost-Always-sort-shared-before-static-fixes-7171.patch b/poky/meta/recipes-devtools/meson/meson/0001-boost-Always-sort-shared-before-static-fixes-7171.patch new file mode 100644 index 000000000..217218180 --- /dev/null +++ b/poky/meta/recipes-devtools/meson/meson/0001-boost-Always-sort-shared-before-static-fixes-7171.patch @@ -0,0 +1,35 @@ +From 5862ad6965c60caa861dfdcd29e499c34c4d00da Mon Sep 17 00:00:00 2001 +From: Daniel Mensinger +Date: Thu, 21 May 2020 13:35:27 +0200 +Subject: [PATCH] boost: Always sort shared before static (fixes #7171) + +Upstream-Status: Backport [https://github.com/mesonbuild/meson/commit/5862ad6965c60caa861dfdcd29e499c34c4d00da] + +Signed-off-by: Andrew Geissler +--- + mesonbuild/dependencies/boost.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py +index 6e85c534..38497041 100644 +--- a/mesonbuild/dependencies/boost.py ++++ b/mesonbuild/dependencies/boost.py +@@ -189,13 +189,13 @@ class BoostLibraryFile(): + def __lt__(self, other: T.Any) -> bool: + if isinstance(other, BoostLibraryFile): + return ( +- self.mod_name, self.version_lib, self.arch, self.static, ++ self.mod_name, self.static, self.version_lib, self.arch, + not self.mt, not self.runtime_static, + not self.debug, self.runtime_debug, self.python_debug, + self.stlport, self.deprecated_iostreams, + self.name, + ) < ( +- other.mod_name, other.version_lib, other.arch, other.static, ++ other.mod_name, other.static, other.version_lib, other.arch, + not other.mt, not other.runtime_static, + not other.debug, other.runtime_debug, other.python_debug, + other.stlport, other.deprecated_iostreams, +-- +2.26.2 + -- cgit v1.2.3