Hi,
Is there a problem applying this to kirkstone? Master and other
branches are not affected.
Cheers,
-Mikko
On Mon, Aug 08, 2022 at 09:27:19AM +0300,
bounce+67612+169014+3616751+9982...@lists.openembedded.org wrote:
> From: Mikko Rapeli <mikko.rap...@bmw.de>
>
> For fiber, only CMake modules were installed in boost 1.78.0.
> In 1.79.0 and versions before 1.78.0 also the shared libraries
> are installed. This upstream patch fixes the issue in 1.78.0.
>
> Note that boost git repo does not show changes in tools/build
> directory between 1.78.0 and 1.79.0 tags but the release tar balls
> contain a large update of which this one is needed to fix the missing
> shared libraries.
>
> Only kirkstone is affected.
>
> buildhistory shows the difference in metadata boost-fiber binary package
> without and with this patch:
>
> --- a/packages/core2-64-poky-linux/boost/boost-fiber/latest
> +++ b/packages/core2-64-poky-linux/boost/boost-fiber/latest
> @@ -1,8 +1,9 @@
> PV = 1.78.0
> PR = r0
> -RPROVIDES =
> -RDEPENDS =
> +PKG = libboost-fiber1.78.0
> +RPROVIDES = boost-fiber (=1.78.0)
> +RDEPENDS = boost-context (>= 1.78.0) glibc (>= 2.35) libgcc (>= 11.3.0)
> libstdc++ (>= 11.3.0)
> RRECOMMENDS =
> -PKGSIZE = 0
> +PKGSIZE = 80032
> FILES = /usr/lib/libboost_fiber*.so.*
> -FILELIST =
> +FILELIST = /usr/lib/libboost_fiber.so.1.78.0
>
> Signed-off-by: Mikko Rapeli <mikko.rap...@bmw.de>
> ---
> ...ll-targets-if-there-s-build-no-in-ur.patch | 82 +++++++++++++++++++
> meta/recipes-support/boost/boost_1.78.0.bb | 1 +
> 2 files changed, 83 insertions(+)
> create mode 100644
> meta/recipes-support/boost/boost/0001-Don-t-skip-install-targets-if-there-s-build-no-in-ur.patch
>
> diff --git
> a/meta/recipes-support/boost/boost/0001-Don-t-skip-install-targets-if-there-s-build-no-in-ur.patch
>
> b/meta/recipes-support/boost/boost/0001-Don-t-skip-install-targets-if-there-s-build-no-in-ur.patch
> new file mode 100644
> index 0000000000..df8b285700
> --- /dev/null
> +++
> b/meta/recipes-support/boost/boost/0001-Don-t-skip-install-targets-if-there-s-build-no-in-ur.patch
> @@ -0,0 +1,82 @@
> +From 78fd284a42caabe8815cb0870b46e5567872e75b Mon Sep 17 00:00:00 2001
> +From: Dmitry <grisumb...@gmail.com>
> +Date: Sat, 11 Dec 2021 16:58:23 +0300
> +Subject: [PATCH] Don't skip install targets if there's <build>no in ureqs
> + (#113)
> +
> +---
> + src/tools/stage.jam | 4 ++++
> + test/install_build_no.py | 26 ++++++++++++++++++++++++++
> + test/test_all.py | 1 +
> + 3 files changed, 31 insertions(+)
> + create mode 100755 test/install_build_no.py
> +
> +Fixes install of boost fiber shared libraries which are missing in 1.78.0
> +but working in 1.79.0. Only kirkstone affected by this.
> +
> +Upstream-Status: Backport
> +
> +Signed-off-by: Mikko Rapeli <mikko.rap...@bmw.de>
> +
> +diff --git a/tools/build/src/tools/stage.jam
> b/tools/build/src/tools/stage.jam
> +index c5f02e3ba..325129dc8 100644
> +--- a/tools/build/src/tools/stage.jam
> ++++ b/tools/build/src/tools/stage.jam
> +@@ -478,6 +478,10 @@ class install-target-class : basic-target
> + return [ sequence.unique $(result2) ] ;
> + }
> +
> ++ rule skip-from-usage-requirements ( )
> ++ {
> ++ }
> ++
> + # Returns true iff 'type' is subtype of some element of
> 'types-to-include'.
> + #
> + local rule include-type ( type : types-to-include * )
> +diff --git a/tools/build/test/install_build_no.py
> b/tools/build/test/install_build_no.py
> +new file mode 100755
> +index 000000000..0ccf3c5cc
> +--- /dev/null
> ++++ b/tools/build/test/install_build_no.py
> +@@ -0,0 +1,26 @@
> ++#!/usr/bin/python
> ++
> ++# Copyright 2021 Dmitry Arkhipov (grisumb...@gmail.com)
> ++# Distributed under the Boost Software License, Version 1.0.
> ++# (See accompanying file LICENSE.txt or
> https://www.bfgroup.xyz/b2/LICENSE.txt)
> ++
> ++# Check that <build>no in usage-requirements of dependencies does not affect
> ++# install rule, i.e. a skipped installed target does not affect insallation
> of
> ++# other targets.
> ++
> ++import BoostBuild
> ++
> ++t = BoostBuild.Tester()
> ++
> ++t.write("a.cpp", "int main() {}\n")
> ++
> ++t.write("jamroot.jam", """
> ++make x : : maker : <build>no ;
> ++exe a : a.cpp ;
> ++install install : x a ;
> ++""")
> ++
> ++t.run_build_system()
> ++t.expect_addition("install/a.exe")
> ++
> ++t.cleanup()
> +diff --git a/tools/build/test/test_all.py b/tools/build/test/test_all.py
> +index b7ef5ad70..9ed729d01 100644
> +--- a/tools/build/test/test_all.py
> ++++ b/tools/build/test/test_all.py
> +@@ -250,6 +250,7 @@ tests = ["abs_workdir",
> + "inherit_toolset",
> + "inherited_dependency",
> + "inline",
> ++ "install_build_no",
> + "libjpeg",
> + "liblzma",
> + "libpng",
> +--
> +2.20.1
> +
> diff --git a/meta/recipes-support/boost/boost_1.78.0.bb
> b/meta/recipes-support/boost/boost_1.78.0.bb
> index 58be9dcf12..08364a4c3c 100644
> --- a/meta/recipes-support/boost/boost_1.78.0.bb
> +++ b/meta/recipes-support/boost/boost_1.78.0.bb
> @@ -7,4 +7,5 @@ SRC_URI += "file://boost-CVE-2012-2677.patch \
> file://0001-dont-setup-compiler-flags-m32-m64.patch \
> file://de657e01635306085488290ea83de541ec393f8b.patch \
>
> file://0001-futex-fix-build-on-32-bit-architectures-using-64-bit.patch \
> +
> file://0001-Don-t-skip-install-targets-if-there-s-build-no-in-ur.patch \
> "
> --
> 2.20.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#169486):
https://lists.openembedded.org/g/openembedded-core/message/169486
Mute This Topic: https://lists.openembedded.org/mt/92886894/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
