From 1b97f0352e38f8346984329b82a8be71632220a6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 7 Mar 2024 13:06:42 +0000 Subject: gentoo auto-resync : 07:03:2024 - 13:06:41 --- dev-build/Manifest.gz | Bin 6538 -> 6539 bytes dev-build/b2/Manifest | 3 -- dev-build/b2/b2-4.10.1.ebuild | 70 ---------------------------------- dev-build/b2/files/b2-4.9.2-odr.patch | 54 -------------------------- 4 files changed, 127 deletions(-) delete mode 100644 dev-build/b2/b2-4.10.1.ebuild delete mode 100644 dev-build/b2/files/b2-4.9.2-odr.patch (limited to 'dev-build') diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz index 4f6b12f2c831..44c9b09f3178 100644 Binary files a/dev-build/Manifest.gz and b/dev-build/Manifest.gz differ diff --git a/dev-build/b2/Manifest b/dev-build/b2/Manifest index adf9f6e2e29a..2a50c1107dda 100644 --- a/dev-build/b2/Manifest +++ b/dev-build/b2/Manifest @@ -2,10 +2,7 @@ AUX b2-4.9.2-add-none-feature-options.patch 588 BLAKE2B b2531258cd54eb73f9a0b917 AUX b2-4.9.2-darwin-gentoo-toolchain.patch 399 BLAKE2B 213ddbeac6be079df8383ac51c1935c21c7c4e9c2fad2dc71cc0e6317d1bcb282d7fa26997eb677408a5b5fdf2809062c54be18265dd618ec01cc771d99fdff1 SHA512 9d69ecab3cdd58915269491ed98824c554a5291820b8c3116d3aa36acee69edca4eb1528baeece513d290c20fcedabd342d426aa2c153f7ad5f08e0815357868 AUX b2-4.9.2-disable_python_rpath.patch 343 BLAKE2B 7b8449db1054dcee76ecbe1b1c826ae3d6964acfcfc0850ff3c75d3c71b043587bccac6b96797229c6dec39beb593893d16ae93a4d7fd16b969129fe63f73d0b SHA512 99bc1260f3d36faf60ab2837039466201bddfeec5c60f65c1c5e52d6d6c1667d419376328f8202596aa2b66448308175d2504062ee6e1708ea0f44d02988ceb4 AUX b2-4.9.2-no-implicit-march-flags.patch 8376 BLAKE2B 50e0b8effbb268467d90cc51df70dc4bd234789b352a279d9bb3e60161be80296f5f31f4a0d2a3d1ae2380f3079f7b950b24ef494574e25bbda48b516c6aacbb SHA512 0089a48cbe3e9e4f222e5cd1e9e12a5c4d16857b002a1c849f4cf6f8d7935c0a9b1e0f51ced51bf5346c2fdcbd214ce05e3c144c98fbf82a9842c45b59c19740 -AUX b2-4.9.2-odr.patch 1109 BLAKE2B 0bf70f2b2237369acd5089d1d1c6e1362f1d3528b036a7f7b9c5c4d077e60850f45c87a67c830f441297e09be2f7dd8bf41ea45a2c66b307678404c4a0db0ed5 SHA512 90ca58661322b35c4af6543558015368385a1b0e12740cd76723d893f95411645ec4a3a23694503863dd786b73a0ec9b0cb34b473e357334d8e82d973f800e4b AUX site-config.jam 685 BLAKE2B b9f73808b6ca454c2220b9d296e7f131c01e6339f545b07160df5f81435926104b134e6baf5af12faf675af074d5de43952678904242f2d7853acd5268bafd2a SHA512 10fc14e622a38d64a9a8cfa78ec9302618de657c38578cf9a9815e88afd80ec7e550bd5a66d8c919bb9de93b77028bce6f382d7dd6bf118f9b2a3a607ced52b2 -DIST b2-4.10.1.tar.gz 982429 BLAKE2B bb1e6ef741ca10d3b0029e64d69a7ee7eb0d40d26c68d2a3932d4210e8e2a83131c9bac2d54f2885373725d58fe73dd7fa7aebfc5781059f01c3462c738d426c SHA512 0bc4897a342685190626a6593926c4b200c5ca9b498ba77287a7c49467a8e3f65cb850b9616fd05d4aea9ebfab32ec46792d7d8226bed89911a711ce14ecce30 DIST b2-5.0.0.tar.gz 1015818 BLAKE2B 87b6f34733002479f91f658aee4f776930ae6441f33b2540b82049e18c4199280e73047afafa90dc156cc75db8b587c5bb9e2ce65d93c493775ac4107ce3201b SHA512 37403f0bd863753c5313393405dd8514a4f8d9f0839ccd397ee1856e02af6116bd238d345e5b766512441ca1c0b09883386588e270bd982eca45235eef1b01b7 -EBUILD b2-4.10.1.ebuild 1916 BLAKE2B a3a547177ff331c2e717f4594a91cb134a9d2bf17e6d3cde2c5018f44d0925544ae83ee011e720a02f100d3fa91da0214b7acdc140797e050ca680fb7876d806 SHA512 af4b96373dbf8cfc23499c2d5a09ca9e855254d516419d92ca31f7bff10636dcea3a9fbadf5c9dc6df87aa2544862467f570fb8de81a0b27c6047abeb7e37c92 EBUILD b2-5.0.0.ebuild 1968 BLAKE2B 036dd155a7aac3e1fc74db32065fddd268b2b0c2702f7501840bd5c2825e7d67e8abf11535f64327e53754772bba8ce3c320b78e3c476597ff94b79f11e8b26d SHA512 bb0c2f60fe1b88f9da735111b42546d49b1e8528d647c900426454896a6f6330f27667e0f94183954260bdfec679c7576279b00602cf4358f045cd0f11281110 MISC metadata.xml 320 BLAKE2B e32bcf6d7bfe5e8a0f36d34022d49ef8baf1d4c0324fa7e7b25e1fa41ac81c21e010a8e49d456b7ce6027c51af57b6b07f3bdc8b7e05daa18b288c63a58a171e SHA512 767da992cd650d91b393848e73d6f0626febcb02eba350a16d390e8416a2832c49b1ca2608be98a9f4abd9ae2078a7f1a543a387be139e5533f90d82171796bf diff --git a/dev-build/b2/b2-4.10.1.ebuild b/dev-build/b2/b2-4.10.1.ebuild deleted file mode 100644 index 55ca9c3a4e4c..000000000000 --- a/dev-build/b2/b2-4.10.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo 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.bfgroup.xyz/b2/" -SRC_URI="https://github.com/bfgroup/b2/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P}/src" - -LICENSE="Boost-1.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="examples" -RESTRICT="test" - -RDEPEND="!dev-util/boost-build" - -PATCHES=( - "${FILESDIR}"/${PN}-4.9.2-disable_python_rpath.patch - "${FILESDIR}"/${PN}-4.9.2-darwin-gentoo-toolchain.patch - "${FILESDIR}"/${PN}-4.9.2-add-none-feature-options.patch - "${FILESDIR}"/${PN}-4.9.2-no-implicit-march-flags.patch - "${FILESDIR}"/${PN}-4.9.2-odr.patch -) - -src_configure() { - # need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100) - append-lfs-flags -} - -src_compile() { - cd engine || die - - # upstream doesn't want separate flags for CPPFLAGS/LDFLAGS - # https://github.com/bfgroup/b2/pull/187#issuecomment-1335688424 - edo ${CONFIG_SHELL:-${BASH}} ./build.sh cxx \ - --cxx="$(tc-getCXX)" \ - --cxxflags="${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}" \ - -d+2 \ - --without-python -} - -src_test() { - # Forget tests, b2 is a lost cause - : -} - -src_install() { - dobin engine/b2 - - insinto /usr/share/b2/src - doins -r "${FILESDIR}/site-config.jam" \ - bootstrap.jam build-system.jam ../example/user-config.jam \ - build kernel options tools util - - find "${ED}"/usr/share/b2/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/dev-build/b2/files/b2-4.9.2-odr.patch b/dev-build/b2/files/b2-4.9.2-odr.patch deleted file mode 100644 index 62cbca189640..000000000000 --- a/dev-build/b2/files/b2-4.9.2-odr.patch +++ /dev/null @@ -1,54 +0,0 @@ -Avoid ODR violations by giving "_stack" internal linkage -https://bugs.gentoo.org/858320 - ---- a/engine/function.cpp -+++ b/engine/function.cpp -@@ -213,11 +213,11 @@ - } JAM_FUNCTION; - - -+namespace -+{ - typedef struct _stack STACK; - typedef STACK* stack_ptr; - --namespace --{ - template - using remove_cref_t - = typename std::remove_const< -@@ -260,7 +260,6 @@ - typename select_last_impl<(sizeof...(A) == 1), type_list > - ::template type; - #endif --} - - struct _stack - { -@@ -439,6 +438,8 @@ - cleanups_size += n; - } - -+} -+ - static STACK * stack_global() - { - static _stack singleton; ---- a/engine/make1.cpp -+++ b/engine/make1.cpp -@@ -86,6 +86,7 @@ - #define T_STATE_MAKE1B 1 /* make1b() should be called */ - #define T_STATE_MAKE1C 2 /* make1c() should be called */ - -+namespace { - typedef struct _state state; - struct _state - { -@@ -94,6 +95,7 @@ - TARGET * parent; /* parent argument necessary for MAKE1A */ - int32_t curstate; /* current state */ - }; -+} - - static void make1a( state * const ); - static void make1b( state * const ); -- cgit v1.2.3