diff options
| -rw-r--r-- | meta-phosphor/recipes-devtools/meson/meson_0.54.2.bbappend | 3 | ||||
| -rw-r--r-- | poky/meta/recipes-devtools/meson/meson.inc | 1 | ||||
| -rw-r--r-- | poky/meta/recipes-devtools/meson/meson/0001-boost-Always-sort-shared-before-static-fixes-7171.patch (renamed from meta-phosphor/recipes-devtools/meson/meson/0001-boost-Always-sort-shared-before-static-fixes-7171.patch) | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/meta-phosphor/recipes-devtools/meson/meson_0.54.2.bbappend b/meta-phosphor/recipes-devtools/meson/meson_0.54.2.bbappend deleted file mode 100644 index 4880c90a8..000000000 --- a/meta-phosphor/recipes-devtools/meson/meson_0.54.2.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://0001-boost-Always-sort-shared-before-static-fixes-7171.patch" 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/meta-phosphor/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 index 08cb103e5..217218180 100644 --- a/meta-phosphor/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 @@ -3,6 +3,9 @@ From: Daniel Mensinger <daniel@mensinger-ka.de> 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 <geissonator@gmail.com> --- mesonbuild/dependencies/boost.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -27,6 +30,6 @@ index 6e85c534..38497041 100644 not other.mt, not other.runtime_static, not other.debug, other.runtime_debug, other.python_debug, other.stlport, other.deprecated_iostreams, --- +-- 2.26.2 |