diff --git a/sdk_container/src/third_party/portage-stable/changelog/updates/2022-08-12-boost.md b/sdk_container/src/third_party/portage-stable/changelog/updates/2022-08-12-boost.md new file mode 100644 index 0000000000..4b0af3d404 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/changelog/updates/2022-08-12-boost.md @@ -0,0 +1 @@ +- boost ([1.79](https://www.boost.org/users/history/version_1_79_0.html)) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/boost/Manifest index 05253944a4..7e0c565941 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/Manifest @@ -1,3 +1 @@ -DIST boost-1.77.0-patches-1.tar.xz 9612 BLAKE2B b56e45cee94329c97e8ee4e6f040832829e63fb0ae47f02fb1aa54720311f56e68b4d4d53557952bb280d60316ecf64ffc1a1e9c9411b70a733690270b85c2d2 SHA512 1358fa6d3afa45fe414f0c11bb583cc8b95737405c6fc3831f7485e22edac990e98849c06c851a4d0fe26bbeec7b8b40103090dc80417ae717ba33caa2088d86 -DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429 -DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f +DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.76.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.76.0-r1.ebuild deleted file mode 100644 index fd0a7959b9..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.76.0-r1.ebuild +++ /dev/null @@ -1,352 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal - -MY_PV="$(ver_rs 1- _)" -MAJOR_V="$(ver_cut 1-2)" - -DESCRIPTION="Boost Libraries for C++" -HOMEPAGE="https://www.boost.org/" -SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2" -S="${WORKDIR}/${PN}_${MY_PV}" - -LICENSE="Boost-1.0" -SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd" -REQUIRED_USE=" - mpi? ( threads ) - python? ( ${PYTHON_REQUIRED_USE} )" -# the tests will never fail because these are not intended as sanity -# tests at all. They are more a way for upstream to check their own code -# on new compilers. Since they would either be completely unreliable -# (failing for no good reason) or completely useless (never failing) -# there is no point in having them in the ebuild to begin with. -RESTRICT="test" - -RDEPEND=" - !app-admin/eselect-boost - !dev-libs/boost-numpy - !=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] ) - !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] ) - lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] ) - mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] ) - python? ( - ${PYTHON_DEPS} - numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) - ) - zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND=">=dev-util/boost-build-${MAJOR_V}-r2" - -PATCHES=( - "${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch - "${FILESDIR}"/${PN}-1.71.0-context-x32.patch - "${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch - # Boost.MPI's __init__.py doesn't work on Py3 - "${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch - "${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch - "${FILESDIR}"/${PN}-1.76-boost-numpy.patch - "${FILESDIR}"/${PN}-1.76-sparc-define.patch -) - -python_bindings_needed() { - multilib_is_native_abi && use python -} - -tools_needed() { - multilib_is_native_abi && use tools -} - -create_user-config.jam() { - local user_config_jam="${BUILD_DIR}"/user-config.jam - if [[ -s ${user_config_jam} ]]; then - einfo "${user_config_jam} already exists, skipping configuration" - return - else - einfo "Creating configuration in ${user_config_jam}" - fi - - local compiler compiler_version compiler_executable="$(tc-getCXX)" - if [[ ${CHOST} == *-darwin* ]]; then - compiler="darwin" - compiler_version="$(gcc-fullversion)" - else - compiler="gcc" - compiler_version="$(gcc-version)" - fi - - if use mpi; then - local mpi_configuration="using mpi ;" - fi - - cat > "${user_config_jam}" <<- __EOF__ || die - using ${compiler} : ${compiler_version} : ${compiler_executable} : "${CFLAGS}" "${CXXFLAGS}" "${LDFLAGS}" ; - ${mpi_configuration} - __EOF__ - - if python_bindings_needed; then - append_to_user_config() { - local py_config - if tc-is-cross-compiler; then - py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;" - else - py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;" - fi - echo "${py_config}" >> "${user_config_jam}" || die - } - python_foreach_impl append_to_user_config - fi - - if python_bindings_needed && use numpy; then - einfo "Enabling support for NumPy extensions in Boost.Python" - else - einfo "Disabling support for NumPy extensions in Boost.Python" - - # Boost.Build does not allow for disabling of numpy - # extensions, thereby leading to automagic numpy - # https://github.com/boostorg/python/issues/111#issuecomment-280447482 - sed \ - -e 's/\[ unless \[ python\.numpy \] : no \]/no/g' \ - -i "${BUILD_DIR}"/libs/python/build/Jamfile || die - fi -} - -pkg_setup() { - # Bail out on unsupported build configuration, bug #456792 - if [[ -f "${EROOT}"/etc/site-config.jam ]]; then - if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then - eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets." - eerror "Boost can not be built in such configuration." - eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it." - die "Unsupported target in ${EROOT}/etc/site-config.jam" - fi - fi -} - -src_prepare() { - default - multilib_copy_sources -} - -ejam() { - create_user-config.jam - - local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" ) - if python_bindings_needed; then - append_to_b2_opts() { - b2_opts+=( python="${EPYTHON#python}" ) - } - python_foreach_impl append_to_b2_opts - else - b2_opts+=( --without-python ) - fi - b2_opts+=( "$@" ) - - echo b2 "${b2_opts[@]}" >&2 - b2 "${b2_opts[@]}" -} - -src_configure() { - # Workaround for too many parallel processes requested, bug #506064 - [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64" - - OPTIONS=( - $(usex debug gentoodebug gentoorelease) - "-j$(makeopts_jobs)" - -q - -d+2 - pch=off - $(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off') - $(usex mpi '' '--without-mpi') - $(usex nls '' '--without-locale') - $(usex context '' '--without-context --without-coroutine --without-fiber') - $(usex threads '' '--without-thread') - --without-stacktrace - --boost-build="${BROOT}"/usr/share/boost-build/src - --layout=system - # building with threading=single is currently not possible - # https://svn.boost.org/trac/boost/ticket/7105 - threading=multi - link=$(usex static-libs shared,static shared) - # this seems to be the only way to disable compression algorithms - # https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build - -sNO_BZIP2=$(usex bzip2 0 1) - -sNO_LZMA=$(usex lzma 0 1) - -sNO_ZLIB=$(usex zlib 0 1) - -sNO_ZSTD=$(usex zstd 0 1) - ) - - if [[ ${CHOST} == *-darwin* ]]; then - # We need to add the prefix, and in two cases this exceeds, so prepare - # for the largest possible space allocation. - append-ldflags -Wl,-headerpad_max_install_names - fi - - # Use C++14 globally as of 1.62 - append-cxxflags -std=c++14 -} - -multilib_src_compile() { - ejam \ - --prefix="${EPREFIX}"/usr \ - "${OPTIONS[@]}" || die - - if tools_needed; then - pushd tools >/dev/null || die - ejam \ - --prefix="${EPREFIX}"/usr \ - "${OPTIONS[@]}" \ - || die "Building of Boost tools failed" - popd >/dev/null || die - fi -} - -multilib_src_install() { - ejam \ - --prefix="${ED}"/usr \ - --includedir="${ED}"/usr/include \ - --libdir="${ED}"/usr/$(get_libdir) \ - "${OPTIONS[@]}" install || die "Installation of Boost libraries failed" - - pushd "${ED}"/usr/$(get_libdir) >/dev/null || die - - local ext=$(get_libname) - if use threads; then - local f - for f in *${ext}; do - dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}} - done - fi - - popd >/dev/null || die - - if tools_needed; then - dobin dist/bin/* - - insinto /usr/share - doins -r dist/share/boostbook - fi - - # boost's build system truely sucks for not having a destdir. Because for - # this reason we are forced to build with a prefix that includes the - # DESTROOT, dynamic libraries on Darwin end messed up, referencing the - # DESTROOT instread of the actual EPREFIX. There is no way out of here - # but to do it the dirty way of manually setting the right install_names. - if [[ ${CHOST} == *-darwin* ]]; then - einfo "Working around completely broken build-system(tm)" - local d - for d in "${ED}"/usr/lib/*.dylib; do - if [[ -f ${d} ]]; then - # fix the "soname" - ebegin " correcting install_name of ${d#${ED}}" - install_name_tool -id "/${d#${D}}" "${d}" - eend $? - # fix references to other libs - refs=$(otool -XL "${d}" | \ - sed -e '1d' -e 's/^\t//' | \ - grep "^libboost_" | \ - cut -f1 -d' ') - local r - for r in ${refs}; do - ebegin " correcting reference to ${r}" - install_name_tool -change \ - "${r}" \ - "${EPREFIX}/usr/lib/${r}" \ - "${d}" - eend $? - done - fi - done - fi -} - -multilib_src_install_all() { - if ! use numpy; then - rm -r "${ED}"/usr/include/boost/python/numpy* || die - fi - - if use python; then - if use mpi; then - move_mpi_py_into_sitedir() { - python_moduleinto boost - python_domodule "${S}"/libs/mpi/build/__init__.py - - python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so - rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die - - python_optimize - } - python_foreach_impl move_mpi_py_into_sitedir - else - rm -r "${ED}"/usr/include/boost/mpi/python* || die - fi - else - rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die - fi - - if ! use nls; then - rm -r "${ED}"/usr/include/boost/locale || die - fi - - if ! use context; then - rm -r "${ED}"/usr/include/boost/context || die - rm -r "${ED}"/usr/include/boost/coroutine{,2} || die - rm "${ED}"/usr/include/boost/asio/spawn.hpp || die - fi - - if use doc; then - # find extraneous files that shouldn't be installed - # as part of the documentation and remove them. - find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die - find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die - find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die - - docinto html - dodoc *.{htm,html,png,css} - dodoc -r doc libs more tools - - # To avoid broken links - dodoc LICENSE_1_0.txt - - dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost - fi -} - -pkg_preinst() { - # Yay for having symlinks that are nigh-impossible to remove without - # resorting to dirty hacks like these. Removes lingering symlinks - # from the slotted versions. - local symlink - for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do - if [[ -L ${symlink} ]]; then - rm -f "${symlink}" || die - fi - done - - # some ancient installs still have boost cruft lying around - # for unknown reasons, causing havoc for reverse dependencies - # Bug: 607734 - rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die -} - -pkg_postinst() { - elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as" - elog - elog " undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation" - elog " ::transform_primary[abi:cxx11](char const*, char const*) const'" - elog - elog "Then you need to recompile Boost and all its reverse dependencies" - elog "using the same toolchain. In general, *every* change of the C++ toolchain" - elog "requires a complete rebuild of the Boost-dependent ecosystem." - elog - elog "See for instance https://bugs.gentoo.org/638138" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.77.0-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.79.0.ebuild similarity index 91% rename from sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.77.0-r3.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.79.0.ebuild index 4e4ee15148..844f6d24b1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.77.0-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.79.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal @@ -13,12 +13,11 @@ MAJOR_V="$(ver_cut 1-2)" DESCRIPTION="Boost Libraries for C++" HOMEPAGE="https://www.boost.org/" SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches-1.tar.xz" S="${WORKDIR}/${PN}_${MY_PV}" LICENSE="Boost-1.0" SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122 -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # the tests will never fail because these are not intended as sanity @@ -29,8 +28,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="test" RDEPEND=" - !app-admin/eselect-boost - !dev-libs/boost-numpy !=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] ) @@ -44,19 +41,17 @@ RDEPEND=" zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] ) zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" -BDEPEND=">=dev-util/boost-build-${MAJOR_V}-r2" +#BDEPEND=">=dev-util/boost-build-${MAJOR_V}" +BDEPEND=">=dev-util/boost-build-1.78.0-r1" PATCHES=( - "${WORKDIR}"/${PN}-1.71.0-disable_icu_rpath.patch - "${WORKDIR}"/${PN}-1.71.0-context-x32.patch - "${WORKDIR}"/${PN}-1.71.0-build-auto_index-tool.patch + "${FILESDIR}"/${PN}-1.79.0-disable_icu_rpath.patch + "${FILESDIR}"/${PN}-1.79.0-context-x32.patch + "${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch # Boost.MPI's __init__.py doesn't work on Py3 - "${WORKDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch - "${WORKDIR}"/${PN}-1.74-CVE-2012-2677.patch - "${WORKDIR}"/${PN}-1.76-sparc-define.patch - "${WORKDIR}"/${PN}-1.77-math-deprecated-include.patch - "${WORKDIR}"/${PN}-1.77-geometry.patch - "${FILESDIR}"/${P}-python-3.10.patch + "${FILESDIR}"/${PN}-1.79.0-boost-mpi-python-PEP-328.patch + "${FILESDIR}"/${PN}-1.79.0-CVE-2012-2677.patch + "${FILESDIR}"/${PN}-1.79.0-fix-mips1-transition.patch ) python_bindings_needed() { @@ -90,7 +85,7 @@ create_user-config.jam() { fi cat > "${user_config_jam}" <<- __EOF__ || die - using ${compiler} : ${compiler_version} : ${compiler_executable} : "${CFLAGS}" "${CXXFLAGS}" "${LDFLAGS}" ; + using ${compiler} : ${compiler_version} : ${compiler_executable} : "${CFLAGS}" "${CXXFLAGS}" "${LDFLAGS}" "$(tc-getAR)" "$(tc-getRANLIB)" ; ${mpi_configuration} __EOF__ diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.76-boost-numpy.patch b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.76-boost-numpy.patch deleted file mode 100644 index d9af132039..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.76-boost-numpy.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0796305c863804a2b31610507c531da5c0408422 Mon Sep 17 00:00:00 2001 -From: Peter Dimov -Date: Mon, 24 May 2021 22:14:55 +0300 -Subject: [PATCH] Use the /python//numpy target instead of [ numpy.include ] - (fixes #361) - ---- - libs/python/build/Jamfile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libs/python/build/Jamfile b/libs/python/build/Jamfile -index dbc9fb203..03b69a25d 100644 ---- a/libs/python/build/Jamfile -+++ b/libs/python/build/Jamfile -@@ -117,7 +117,7 @@ lib boost_numpy - BOOST_NUMPY_SOURCE - [ cond [ python.numpy ] : /python//python_for_extensions ] - [ unless [ python.numpy ] : no ] -- $(numpy-include) -+ /python//numpy - boost_python - on:BOOST_DEBUG_PYTHON - -@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.76-sparc-define.patch b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.76-sparc-define.patch deleted file mode 100644 index b3909ee313..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.76-sparc-define.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://github.com/boostorg/predef/commit/1be0e4a2d8db15a405f64a6f65507b87c1be7e1a.patch - -From 1be0e4a2d8db15a405f64a6f65507b87c1be7e1a Mon Sep 17 00:00:00 2001 -From: tkoecker -Date: Fri, 21 May 2021 16:31:11 +0200 -Subject: [PATCH] added missing brackets (#118) ---- a/boost/predef/architecture/sparc.h -+++ b/boost/predef/architecture/sparc.h -@@ -34,10 +34,10 @@ Distributed under the Boost Software License, Version 1.0. - - #if defined(__sparc__) || defined(__sparc) - # undef BOOST_ARCH_SPARC --# if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv9) || defined(__sparc_v9__) -+# if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv9) || defined(__sparc_v9__)) - # define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER(9,0,0) - # endif --# if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv8) || defined(__sparc_v8__) -+# if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv8) || defined(__sparc_v8__)) - # define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER(8,0,0) - # endif - # if !defined(BOOST_ARCH_SPARC) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.77.0-python-3.10.patch b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.77.0-python-3.10.patch deleted file mode 100644 index 69181b1fa4..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.77.0-python-3.10.patch +++ /dev/null @@ -1,44 +0,0 @@ -https://github.com/boostorg/boost_install/commit/0605dadfacf51994dcd8c5c82fb733dc6fa24073 - -From: Martin Jansa -Date: Tue, 19 Oct 2021 12:24:31 +0000 -Subject: [PATCH] BoostConfig.cmake: allow searching for python310 - -* accept double digits in Python3_VERSION_MINOR - -* if someone is using e.g.: - find_package(Python3 REQUIRED) - find_package(Boost REQUIRED python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}) - - with python-3.10 then it currently fails with: - - -- Found PythonLibs: /usr/lib/libpython3.10.so (found version "3.10.0") - -- Found Python3: -native/usr/bin/python3-native/python3 (found version "3.10.0") found components: Interpreter - CMake Error at /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:141 (find_package): - Could not find a package configuration file provided by "boost_python310" - (requested version 1.77.0) with any of the following names: - - boost_python310Config.cmake - boost_python310-config.cmake - - Add the installation prefix of "boost_python310" to CMAKE_PREFIX_PATH or - set "boost_python310_DIR" to a directory containing one of the above files. - If "boost_python310" provides a separate development package or SDK, be - sure it has been installed. - Call Stack (most recent call first): - /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:258 (boost_find_component) - /usr/share/cmake-3.21/Modules/FindBoost.cmake:594 (find_package) - CMakeLists.txt:18 (find_package) - -Signed-off-by: Martin Jansa ---- a/tools/boost_install/BoostConfig.cmake -+++ b/tools/boost_install/BoostConfig.cmake -@@ -113,7 +113,7 @@ macro(boost_find_component comp required quiet) - set(_BOOST_REQUIRED REQUIRED) - endif() - -- if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9])$") -+ if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9][0-9]?)$") - - # handle pythonXY and numpyXY versioned components for compatibility - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.74-CVE-2012-2677.patch b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-CVE-2012-2677.patch similarity index 88% rename from sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.74-CVE-2012-2677.patch rename to sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-CVE-2012-2677.patch index ff947f74f1..5dfbf85bc6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.74-CVE-2012-2677.patch +++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-CVE-2012-2677.patch @@ -3,10 +3,8 @@ https://bugzilla.redhat.com/show_bug.cgi?id=828856 https://bugs.gentoo.org/620468 https://svn.boost.org/trac10/ticket/6701 -Index: boost/pool/pool.hpp -=================================================================== ---- a/boost/pool/pool.hpp (revision 78317) -+++ b/boost/pool/pool.hpp (revision 78326) +--- a/boost/pool/pool.hpp ++++ b/boost/pool/pool.hpp @@ -27,4 +27,6 @@ #include @@ -14,7 +12,7 @@ Index: boost/pool/pool.hpp +#include // boost::integer::static_lcm #include -@@ -358,4 +360,11 @@ +@@ -356,4 +358,11 @@ } + size_type max_chunks() const @@ -26,7 +24,7 @@ Index: boost/pool/pool.hpp + static void * & nextof(void * const ptr) { //! \returns Pointer dereferenced. -@@ -377,5 +388,7 @@ +@@ -375,5 +384,7 @@ //! the first time that object needs to allocate system memory. //! The default is 32. This parameter may not be 0. - //! \param nmax_size is the maximum number of chunks to allocate in one block. @@ -35,7 +33,7 @@ Index: boost/pool/pool.hpp + set_max_size(nmax_size); } -@@ -400,7 +413,7 @@ +@@ -398,7 +409,7 @@ } void set_next_size(const size_type nnext_size) - { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. @@ -46,7 +44,7 @@ Index: boost/pool/pool.hpp + next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks()); } size_type get_max_size() const -@@ -410,5 +423,6 @@ +@@ -408,5 +419,6 @@ void set_max_size(const size_type nmax_size) { //! Set max_size. - max_size = nmax_size; @@ -54,7 +52,7 @@ Index: boost/pool/pool.hpp + max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks()); } size_type get_requested_size() const -@@ -713,7 +727,7 @@ +@@ -709,7 +721,7 @@ BOOST_USING_STD_MIN(); if(!max_size) - next_size <<= 1; @@ -64,7 +62,7 @@ Index: boost/pool/pool.hpp + set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); // initialize it, -@@ -753,7 +767,7 @@ +@@ -749,7 +761,7 @@ BOOST_USING_STD_MIN(); if(!max_size) - next_size <<= 1; @@ -74,14 +72,14 @@ Index: boost/pool/pool.hpp + set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); // initialize it, -@@ -797,4 +811,6 @@ +@@ -793,4 +805,6 @@ //! \returns Address of chunk n if allocated ok. //! \returns 0 if not enough memory for n chunks. + if (n > max_chunks()) + return 0; const size_type partition_size = alloc_size(); -@@ -845,7 +861,7 @@ +@@ -841,7 +855,7 @@ BOOST_USING_STD_MIN(); if(!max_size) - next_size <<= 1; @@ -91,10 +89,8 @@ Index: boost/pool/pool.hpp + set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); // insert it into the list, -Index: libs/pool/test/test_bug_6701.cpp -=================================================================== ---- a/libs/pool/test/test_bug_6701.cpp (revision 78326) -+++ b/libs/pool/test/test_bug_6701.cpp (revision 78326) +--- a/libs/pool/test/test_bug_6701.cpp ++++ b/libs/pool/test/test_bug_6701.cpp @@ -0,0 +1,27 @@ +/* Copyright (C) 2012 Étienne Dupuis +* diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.73-boost-mpi-python-PEP-328.patch b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-boost-mpi-python-PEP-328.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.73-boost-mpi-python-PEP-328.patch rename to sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-boost-mpi-python-PEP-328.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-build-auto_index-tool.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch rename to sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-build-auto_index-tool.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.71.0-context-x32.patch b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-context-x32.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.71.0-context-x32.patch rename to sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-context-x32.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.71.0-disable_icu_rpath.patch b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-disable_icu_rpath.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.71.0-disable_icu_rpath.patch rename to sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-disable_icu_rpath.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-fix-mips1-transition.patch b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-fix-mips1-transition.patch new file mode 100644 index 0000000000..81b29ac6ca --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-fix-mips1-transition.patch @@ -0,0 +1,39 @@ +https://github.com/boostorg/boost/commit/791442bf1ed7a3b14893ed9e73ef2ab32b2a6026, and +https://github.com/boostorg/config/commit/1a55d1d9c6d1cf7739645080bdd92fe903b4211e without the file renaming. + +--- a/boostcpp.jam ++++ b/boostcpp.jam +@@ -634,7 +634,7 @@ rule address-model ( ) + return @boostcpp.deduce-address-model ; + } + +-local deducable-architectures = arm mips1 power riscv s390x sparc x86 combined ; ++local deducable-architectures = arm mips power riscv s390x sparc x86 combined ; + feature.feature deduced-architecture : $(deducable-architectures) : propagated optional composite hidden ; + for a in $(deducable-architectures) + { +@@ -645,10 +645,10 @@ rule deduce-architecture ( properties * ) + { + local result ; + local filtered = [ toolset-properties $(properties) ] ; +- local names = arm mips1 power riscv s390x sparc x86 combined ; ++ local names = arm mips power riscv s390x sparc x86 combined ; + local idx = [ configure.find-builds "default architecture" : $(filtered) + : /boost/architecture//arm +- : /boost/architecture//mips1 ++ : /boost/architecture//mips + : /boost/architecture//power + : /boost/architecture//riscv + : /boost/architecture//s390x +--- a/libs/config/checks/architecture/Jamfile.jam ++++ b/libs/config/checks/architecture/Jamfile.jam +@@ -18,7 +18,8 @@ obj 64 : 64.cpp ; + + obj arm : arm.cpp ; + obj combined : combined.cpp ; +-obj mips1 : mips1.cpp ; ++obj mips : mips1.cpp ; ++alias mips1 : mips ; # Backwards compatibility + obj power : power.cpp ; + obj riscv : riscv.cpp ; + obj sparc : sparc.cpp ; diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/boost/metadata.xml index f787dd7a4b..5ceb55d4b8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/metadata.xml @@ -15,11 +15,11 @@ Install the full API documentation documentation. This takes over 200MB of extra disk space. Build libboost_locale. This library requires compatible C library interfaces, which might not be provided by uClibc or other embedded libraries. Optionally build NumPy extensions when Boost.Python is enabled - Build multi-thread-compatible libraries instead of single-threaded only. Build and install the boost tools (bcp, quickbook, inspect, wave) cpe:/a:boost:boost + boostorg/boost boost diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/Manifest index 20cf00e429..7e0c565941 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/Manifest @@ -1,2 +1 @@ -DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429 -DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f +DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.76.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.76.0-r2.ebuild deleted file mode 100644 index 1e0b91062e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.76.0-r2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -MY_PV="$(ver_rs 1- _)" - -DESCRIPTION="A system for large project software construction, simple to use and powerful" -HOMEPAGE="https://www.boost.org/build/" -SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2" -S="${WORKDIR}/boost_${MY_PV}/tools/build/src" - -LICENSE="Boost-1.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="examples" -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch - "${FILESDIR}"/${PN}-1.71.0-darwin-gentoo-toolchain.patch - "${FILESDIR}"/${PN}-1.73.0-add-none-feature-options.patch - "${FILESDIR}"/${PN}-1.76.0-respect-user-flags.patch - "${FILESDIR}"/${PN}-1.74.0-no-implicit-march-flags.patch - "${FILESDIR}"/${PN}-1.76.0-python-numpy.patch -) - -src_unpack() { - tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed" -} - -src_prepare() { - default - - pushd .. >/dev/null || die - eapply "${FILESDIR}"/${PN}-1.71.0-fix-test.patch - popd >/dev/null || die -} - -src_configure() { - # need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100) - append-lfs-flags -} - -src_compile() { - cd engine || die - ${CONFIG_SHELL:-${BASH}} ./build.sh cxx --cxx="$(tc-getCXX)" --cxxflags="${CXXFLAGS}" -d+2 --without-python || die "building bjam failed" -} - -src_test() { - # Forget tests, bjam is a lost cause - : -} - -src_install() { - dobin engine/{bjam,b2} - - insinto /usr/share/boost-build/src - doins -r "${FILESDIR}/site-config.jam" \ - ../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \ - build kernel options tools util - - find "${ED}"/usr/share/boost-build/src -iname '*.py' -delete || die - - dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt - - if use examples; then - docinto examples - dodoc -r ../example/. - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.77.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.79.0.ebuild similarity index 82% rename from sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.77.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.79.0.ebuild index 82ae416aa5..f17231c6f8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.77.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.79.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,16 +14,16 @@ S="${WORKDIR}/boost_${MY_PV}/tools/build/src" LICENSE="Boost-1.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="examples" RESTRICT="test" PATCHES=( "${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch - "${FILESDIR}"/${PN}-1.77.0-darwin-gentoo-toolchain.patch + "${FILESDIR}"/${PN}-1.78.0-darwin-gentoo-toolchain.patch "${FILESDIR}"/${PN}-1.73.0-add-none-feature-options.patch "${FILESDIR}"/${PN}-1.76.0-respect-user-flags.patch - "${FILESDIR}"/${PN}-1.74.0-no-implicit-march-flags.patch + "${FILESDIR}"/${PN}-1.78.0-no-implicit-march-flags.patch ) src_unpack() { diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.71.0-darwin-gentoo-toolchain.patch b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.71.0-darwin-gentoo-toolchain.patch deleted file mode 100644 index 3693677540..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.71.0-darwin-gentoo-toolchain.patch +++ /dev/null @@ -1,26 +0,0 @@ -Avoid adding all kinds of things to the toolchain's flags that within -Gentoo (Prefix) we really shouldn't, such as sysroot, deployment target, -arch, etc. - ---- a/tools/darwin.jam -+++ b/tools/darwin.jam -@@ -239,6 +239,9 @@ - } - } - -+ # leave compiler flags etc. up to the toolchain -+ return $(version-feature) ; -+ - if $(version-feature) - { - if $(.debug-configuration) -@@ -447,7 +450,8 @@ - support-ppc64 = ; - } - } -- switch $(arch) -+ # Gentoo Prefix toolchain doesn't do multi-arch, so don't try either -+ switch $(donotaddarchpleaseXXXarch) - { - case combined : - { diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.76.0-python-numpy.patch b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.76.0-python-numpy.patch deleted file mode 100644 index ed04d54263..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.76.0-python-numpy.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 61adb508853be1fa2c01a0c3a0c55fbd16cb9a52 Mon Sep 17 00:00:00 2001 -From: Peter Dimov -Date: Mon, 24 May 2021 22:11:23 +0300 -Subject: [PATCH] Declare the /python//numpy target to hold the include path - (fixes #725) - ---- - tools/python.jam | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/tools/python.jam b/tools/python.jam -index 00706932d2..0dfc750a22 100644 ---- a/tools/python.jam -+++ b/tools/python.jam -@@ -1052,6 +1052,9 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : - ; - } - -+ # Declare the numpy target, which contains the NumPy include directory -+ -+ alias numpy : : $(target-requirements) : : $(.numpy-include) ; - } - - # Conditional rule specification that will prevent building of a target diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.77.0-darwin-gentoo-toolchain.patch b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.78.0-darwin-gentoo-toolchain.patch similarity index 61% rename from sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.77.0-darwin-gentoo-toolchain.patch rename to sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.78.0-darwin-gentoo-toolchain.patch index 2690e5fe5d..8de98014db 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.77.0-darwin-gentoo-toolchain.patch +++ b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.78.0-darwin-gentoo-toolchain.patch @@ -14,13 +14,3 @@ arch, etc. if $(version-feature) { if $(.debug-configuration) -@@ -448,7 +451,8 @@ - support-ppc64 = ; - } - } -- switch $(arch) -+ # Gentoo Prefix toolchain doesn't do multi-arch, so don't try either -+ switch $(donotaddarchpleaseXXXarch) - { - case combined : - { diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.74.0-no-implicit-march-flags.patch b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.78.0-no-implicit-march-flags.patch similarity index 97% rename from sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.74.0-no-implicit-march-flags.patch rename to sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.78.0-no-implicit-march-flags.patch index 894af8f62c..093f40d030 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.74.0-no-implicit-march-flags.patch +++ b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.78.0-no-implicit-march-flags.patch @@ -1,6 +1,6 @@ --- a/tools/gcc.jam +++ b/tools/gcc.jam -@@ -1224,135 +1224,9 @@ +@@ -1129,140 +1129,10 @@ # x86 and compatible # The 'native' option appeared in gcc 4.2 so we cannot safely use it as default. # Use i686 instead for 32-bit. @@ -134,11 +134,16 @@ -cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ; -cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ; -cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ; + # ARM +-cpu-flags gcc OPTIONS : arm : cortex-a9+vfpv3 : -mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard ; +-cpu-flags gcc OPTIONS : arm : cortex-a53 : -mcpu=cortex-a53 ; +-cpu-flags gcc OPTIONS : arm : cortex-r5 : -mcpu=cortex-r5 ; +-cpu-flags gcc OPTIONS : arm : cortex-r5+vfpv3-d16 : -mcpu=cortex-r5 -mfpu=vfpv3-d16 -mfloat-abi=hard ; # AIX variant of RS/6000 & PowerPC toolset.flags gcc AROPTIONS 64/aix : "-X64" ; --- a/tools/gcc.py +++ b/tools/gcc.py -@@ -745,138 +745,14 @@ +@@ -737,138 +737,14 @@ # x86 and compatible flags('gcc', 'OPTIONS', ['x86/32'], ['-m32']) flags('gcc', 'OPTIONS', ['x86/64'], ['-m64'])