diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
| commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
| tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-util/boost-build | |
| parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) | |
gentoo resync : 15.12.2019
Diffstat (limited to 'dev-util/boost-build')
15 files changed, 357 insertions, 470 deletions
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest index e256e1efde32..ceccec6829f7 100644 --- a/dev-util/boost-build/Manifest +++ b/dev-util/boost-build/Manifest @@ -1,18 +1,12 @@ -AUX boost-build-1.48.0-disable_python_rpath.patch 341 BLAKE2B 5b25023aa0297f83134a403ca305141a8ad2381659453a4af49bdff85087f685974b4f96b5d8005f67a1fec0ec9ba1ff5298e7412f5173c550bd9180ea7e5c2b SHA512 1bc89bcf7210d6f3fcf88b48c7d173fc76c16dae804a9c927509f7ff525c6c77b09d9fa5c1f02e77ec36dac303d516b3d00bed08626007852a22c400adc992a4 -AUX boost-build-1.49.0-darwin-gentoo-toolchain.patch 651 BLAKE2B f5db950724eae738b6caf3cb2a5e52f334b0e905173c7fe6f1e84480999805f742c28cc92cd9745144f13a84520f834b9e505f8140656aa266af2a7c2c11e978 SHA512 54606684921997c4d280eae7f6033ef6d02dc76d8c56499db25b359879a5a89e0220ec9733d197c4c482339d9968771ddd90891edf543f11f622595ed2bf43cd -AUX boost-build-1.50.0-respect-c_ld-flags.patch 1868 BLAKE2B cff27fe56fd3856364f687c3daea78ae86f1fc5e2d7307e2c84591b0254a6492078c1013aac1c868497553349c4afc4f2c69cce2dd63cac3237b4b7d42524fdc SHA512 821ceff3027c318191b0959c265c420c9f43b9e8185fc20c902a31efaf7bbaaa4dfe4f01408557f7b89774b15104ad391671f467ad2e70af93235e8a0b8d18ee -AUX boost-build-1.52.0-darwin-no-python-framework.patch 419 BLAKE2B 1f9544ea26d8e1e93d85f2196ff13d55f8a735818881021472a0598bdfa993a066dcbfa26d4aa50b650c9a647b78dead18b290adf131549790ed4c9d13f39cb2 SHA512 23f281c53c3e580a30efbea83e2c63d28021151e299b0086b106d1148f3b20e81237a3141a6842b71403f36cd531a58c4eb7ab5bf030ce0e23aa08198202cc48 -AUX boost-build-1.54.0-fix-test.patch 363 BLAKE2B b64a87e69df3d4832e5704014a92b4588b60abc5ad361d3daad39a33a92aba2e0368373be26ea10ae2ea4396a18c098ca5dd00db995f03c9a35e2eb1f9002990 SHA512 d349ff3040c219c3a9f9f6182ca3f1fe7e25d8f2975dd04e66d8e281caf10a5b27cab5e6fa6240ed57b24524fa045a88ba1cf9220efcf065726c78c68378c5e8 -AUX boost-build-1.54.0-support_dots_in_python-buildid.patch 487 BLAKE2B 6b01c71e728d03897b1caa1b408592d95574a3723f86a4ac3a750ae8e458891d5c7fe123998b39b7422a84c3698bbe237555dbd6b759f6c706a409a4dadcc9b6 SHA512 41fbe223120452a6ddf7b8ec9f64b2f653ee3d18b2dfccdba90d9040632f911159ac4102947371e12af7e52ca251aa39db2be9b362251ec86c12860867e50e68 -AUX boost-build-1.55.0-ppc-aix.patch 228 BLAKE2B 80e1c943ae11e7ec7730e83a0126ef8fb041cbdf47dd5cb5eb33829166f98ac7f189cf70a73ae0d4835c6914a0041bc628be8b948eddb36ef74c98476088f4c3 SHA512 a320bfb744667312230cf601d034217f72e3a78fe06851678c5810bb47c8239007aaeffb5719513696922ffc2d4c2200e60e140b34e3992dc353ad0fc69177fe -AUX boost-build-1.62.0-sparc-no-default-flags.patch 2646 BLAKE2B 65a3a5018fed0197fe2bd1f93e5de4e799a201274f7320f4417edd4978a338a800eef1aa911ec7729f4f3b02c9cf85106dc25d466eab0e0c87d7625c4b652936 SHA512 1767c0b72f18ddf7bf4dc9d51c911ce0fe3c775e60cc960f913b218850cae9361728fad192194589929808c6c89c63110810e668fc7f75c79a04cbab1e59834f -AUX boost-build-1.66.0-add-none-feature-options.patch 724 BLAKE2B c757f0e2d9b096cad74f130ed8219f6d0ff81f7f020cfef7352a324f47167cc4c71f49c8d2781d06f624fec98e973add229ac731bf2f37f9dade907bb9c9fc3d SHA512 9d4149739139d268e54304d73d1ceb0073ca94265d8a84467c890c8f68aac3b0060e847b71e961a92f17813bad651d0515898dd4d0535f5cc6c1c4a024e9b39a +AUX boost-build-1.71.0-add-none-feature-options.patch 484 BLAKE2B b1b8b3b837679ad1e3d2b3dc8aa22dd4c6e18687d159964851dc1ca852acd6cbd5000eeda69cfaee11160c37849ca02026de26ba82960235689d83da5401100c SHA512 954b0472cc25afca6a56b793419e4aec3bac2c4683309c9a43619ba5aed166d9b17c0f2b621c46c05507163fb98c314083df20681d148564a666b59fdfdda86c +AUX boost-build-1.71.0-darwin-gentoo-toolchain.patch 651 BLAKE2B b6fe461f4db4a07d4961199dd3c707584b35af4a8ca3c0da8921eb366e80b81aa25506ef18cd9d732f3177e2505258be4268a0e58e5325c59deb7d76d3b55645 SHA512 80aa0b261b6aa1f89bffb34ec720c0b8a5b6e2e4867dcf4fc1cf58ba798243cf61a12c4ea1ce6ebc97ca9ec45fb959fb9c0ec997844d3c750d4a2f5a76f11c63 +AUX boost-build-1.71.0-disable_python_rpath.patch 343 BLAKE2B 7b8449db1054dcee76ecbe1b1c826ae3d6964acfcfc0850ff3c75d3c71b043587bccac6b96797229c6dec39beb593893d16ae93a4d7fd16b969129fe63f73d0b SHA512 99bc1260f3d36faf60ab2837039466201bddfeec5c60f65c1c5e52d6d6c1667d419376328f8202596aa2b66448308175d2504062ee6e1708ea0f44d02988ceb4 +AUX boost-build-1.71.0-fix-test.patch 363 BLAKE2B b64a87e69df3d4832e5704014a92b4588b60abc5ad361d3daad39a33a92aba2e0368373be26ea10ae2ea4396a18c098ca5dd00db995f03c9a35e2eb1f9002990 SHA512 d349ff3040c219c3a9f9f6182ca3f1fe7e25d8f2975dd04e66d8e281caf10a5b27cab5e6fa6240ed57b24524fa045a88ba1cf9220efcf065726c78c68378c5e8 +AUX boost-build-1.71.0-no-implicit-march-flags.patch 15700 BLAKE2B dc73dcbd5320db6c57b62a009371325c5e6964ca76dc66f1504a8ff3498c631dd6defc3b46288be3148048856c4385f95bfda32b60751e038b7da205eb4b3e10 SHA512 a4b62f5a0e96896dde641e2d59551036c2844fdff02c5f266f05fcd4b651c096d9af93ec468af3a5f2b98ca1020ca82612da4db3de498b9eb7e9e1bc40654bcc AUX boost-build-1.71.0-respect-c_ld-flags.patch 367 BLAKE2B fee2e2f2db024a1421ad7f7d59a17908d6d74bd95c568c27adf9853725d8d92b7460d1c520c2a591f4a8d41213e2bd822044aef490b7b50590a6dac63630dc39 SHA512 148171cd6b1946e4dd0c2cfe734ff9a7e7adb4789868a363bd6f0855fad882f69e34aa079c0e1521864db5f5b7dfa449cfed74236b5f6743ed520ed477e48d1c AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df -DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd -DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c24fb745779d1059b73f19f7e52b33b645adfe72b0296c5e098e5cdb3b9f5eddd382374f33fbcd2ad5739287b2206 SHA512 7f2ea9636baf0210e8ed1d21ee798efb6ce23c0710ff8228b285e2214f82193bcd2d912fd435929c554289a59101c7be2e27ce798f93833f307976f0dd070b49 DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20 -EBUILD boost-build-1.65.0.ebuild 3891 BLAKE2B c47be692e2688b4fc97ccd937e68779859b8f0fc32aabe080ffda307b3fdb04fd67309c204348165b277e19504562d7fe1046ca2295a9f6971e7170d45edd570 SHA512 440452088de9c406150f18dfae2a586c3039d16dac623a065d524b6b3587d6f83346906e3e0e1697bc735c53c55ae19414750c8ab3c61090e49cc1a344b6ae88 -EBUILD boost-build-1.70.0.ebuild 3865 BLAKE2B e815fe470d6bc8e7c4e1a08e4ed6425c41c720615077478385710084582f5fba5048626b925a8e89c274b429e81f5b2ba2e820bd4cea3624539ccd3a337fa351 SHA512 d121308dcfb95e2f2b696ba00ef4cbc1279b84cdd2925005ea9f6557ef9763d35874c4e718a8f51da80fb492b3ac24a2799d5f285098a76b7c039ce7d7508dd7 -EBUILD boost-build-1.71.0.ebuild 3109 BLAKE2B 04ed336a2604b68298d139ec219d3d222b83f78b83f90b943bcc3aa7f38bc67425565a403a4d4a6b5d366aa4e44aa1749c76f5ec7bd911d1c35c28e343710ea5 SHA512 a6a00551bd039756814263a67af61be11a8f2cb9180cba5fb8fabc577e670daf3aaf677d6cd7733331d61a242b1395f253d1231b29390524469c3b9c2f53ea38 +DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6 +EBUILD boost-build-1.71.0.ebuild 2666 BLAKE2B 44847ce5b01b52e5baff1e77e85892adaa97ebe20e1bf90d7908272f7475d780af5c19c6b2b213c54906343c69a46e32a2eef4ebd5498b9b0da3ece0c5e387cf SHA512 1a97524d7d1fd5504e0c76169291c1288612c68d11b74a1db2aa18f44d84fd9c36fe34ddf92e5db479c95a6ad0d6cfa44480e6f3f2d65c5f5c58215a4a0ca37c +EBUILD boost-build-1.72.0.ebuild 2002 BLAKE2B b12230bcd018520bf04308e2da1c4c74043f4be8afe93aa058845716e27d35e05042f080c6dbe44cbfa3e2ced878c754c2ddc6e7675de412682c588731ce14cd SHA512 a8e1c3db057d062aeedb022c8136c34c89a1173bffcc58790b1bec8b8c3a1250bf2e6ae3ba5caae87ee4051956005104ce2b9aa4f31f7ee1f0dbf73bc7c11765 MISC metadata.xml 329 BLAKE2B f492b1ba64c3f7bce1d3fb304bcff93357cc069dfd06b69c25cf26f4423ebea51ac4614a8d865635568f0e9db424a6904fc1edd5fa729243838e16e9887f4202 SHA512 57baf2d8e0a4c240d99f68ce122086a147d42145687b712609fdcd73b77fe3fdfecc1b078edb6a9c922213482fcc17c2fccb6762ec69890fbc9a912c4cb34827 diff --git a/dev-util/boost-build/boost-build-1.65.0.ebuild b/dev-util/boost-build/boost-build-1.65.0.ebuild deleted file mode 100644 index 4c164c8d29cf..000000000000 --- a/dev-util/boost-build/boost-build-1.65.0.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -RESTRICT="test" - -PYTHON_COMPAT=( python2_7 ) -inherit eutils flag-o-matic prefix python-single-r1 toolchain-funcs versionator - -MY_PV="$(replace_all_version_separators _)" - -DESCRIPTION="A system for large project software construction, simple to use and powerful" -HOMEPAGE="https://boostorg.github.io/build/" -SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2" - -LICENSE="Boost-1.0" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="examples python test" - -RDEPEND="python? ( ${PYTHON_DEPS} ) - !<dev-libs/boost-1.34.0 - !<=dev-util/boost-build-1.35.0-r1" -DEPEND="${RDEPEND} - test? ( sys-apps/diffutils - ${PYTHON_DEPS} )" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) - test? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/boost_${MY_PV}/tools/build/src" - -PATCHES=( - "${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch" - "${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch" - "${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch" - "${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch" - "${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch" - "${FILESDIR}/${PN}-1.55.0-ppc-aix.patch" - "${FILESDIR}/${PN}-1.62.0-sparc-no-default-flags.patch" -) - -pkg_setup() { - if use python || use test; then - python-single-r1_pkg_setup - fi -} - -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.54.0-fix-test.patch" - popd >/dev/null || die - - # Remove stripping option - # Fix python components build on multilib systems, bug #496446 - cd "${S}/engine" || die - sed -i \ - -e 's|-s\b||' \ - -e "/libpython/s/lib ]/$(get_libdir) ]/" \ - build.jam || die "sed failed" - - # Force regeneration - rm jambase.c || die - - # This patch allows us to fully control optimization - # and stripping flags when bjam is used as build-system - # We simply extend the optimization and debug-symbols feature - # with empty dummies called 'none' - cd "${S}" || die - sed -i \ - -e 's/\(off speed space\)/\1 none/' \ - -e 's/\(debug-symbols : on off\)/\1 none/' \ - tools/builtin.jam || die "sed failed" -} - -src_configure() { - hprefixify engine/Jambase - if use python; then - # replace versions by user-selected one (TODO: fix this when slot-op - # deps are available to always match the best version available) - sed -i \ - -e "s|27 26 25 24 23 22|${EPYTHON#python}|" \ - engine/build.jam || die "sed failed" - fi -} - -src_compile() { - cd engine || die - - local toolset - - if [[ ${CHOST} == *-darwin* ]]; then - toolset=darwin - else - # Using boost's generic toolset here, which respects CC and CFLAGS - toolset=cc - fi - - CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT%/}"/usr) || die "building bjam failed" -} - -src_install() { - dobin engine/bin.*/{bjam,b2} - - insinto /usr/share/boost-build - doins -r "${FILESDIR}/site-config.jam" \ - ../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \ - build kernel options tools util - - if ! use python; then - find "${ED%/}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed" - fi - - 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 -} - -src_test() { - cd ../test || die - - export TMP="${T}" - - DO_DIFF="${PREFIX}/usr/bin/diff" ${PYTHON} test_all.py - - if [[ -s test_results.txt ]]; then - eerror "At least one test failed: $(<test_results.txt)" - die "tests failed" - fi -} diff --git a/dev-util/boost-build/boost-build-1.70.0.ebuild b/dev-util/boost-build/boost-build-1.70.0.ebuild deleted file mode 100644 index a1e13511ec84..000000000000 --- a/dev-util/boost-build/boost-build-1.70.0.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -inherit flag-o-matic prefix python-single-r1 toolchain-funcs - -MY_PV="$(ver_rs 1- _)" - -DESCRIPTION="A system for large project software construction, simple to use and powerful" -HOMEPAGE="https://boostorg.github.io/build/" -SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2" - -LICENSE="Boost-1.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="examples python test" -RESTRICT="test" - -RDEPEND="python? ( ${PYTHON_DEPS} ) - !<dev-libs/boost-1.35.0 - !<=dev-util/boost-build-1.35.0-r1" -DEPEND="${RDEPEND} - test? ( - sys-apps/diffutils - ${PYTHON_DEPS} - )" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/boost_${MY_PV}/tools/build/src" - -PATCHES=( - "${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch" - "${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch" - "${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch" - "${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch" - "${FILESDIR}/${PN}-1.55.0-ppc-aix.patch" - "${FILESDIR}/${PN}-1.62.0-sparc-no-default-flags.patch" - "${FILESDIR}/${PN}-1.66.0-add-none-feature-options.patch" -) - -pkg_setup() { - if use python || use test; then - python-single-r1_pkg_setup - fi -} - -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.54.0-fix-test.patch" - popd >/dev/null || die - - # Remove stripping option - # Fix python components build on multilib systems, bug #496446 - cd "${S}/engine" || die - sed -i \ - -e 's|-s\b||' \ - -e "/libpython/s;lib ];$(get_libdir) ];" \ - build.jam || die "sed failed" - - # Force regeneration - rm jambase.c || die - - # This patch allows us to fully control optimization - # and stripping flags when bjam is used as build-system - # We simply extend the optimization and debug-symbols feature - # with empty dummies called 'none' - cd "${S}" || die - sed -i \ - -e 's/\(off speed space\)/\1 none/' \ - -e 's/\(debug-symbols : on off\)/\1 none/' \ - tools/builtin.jam || die "sed failed" -} - -src_configure() { - hprefixify engine/Jambase - if use python; then - # replace versions by user-selected one (TODO: fix this when slot-op - # deps are available to always match the best version available) - sed -i \ - -e "s|27 26 25 24 23 22|${EPYTHON#python}|" \ - engine/build.jam || die "sed failed" - fi -} - -src_compile() { - cd engine || die - - local toolset - - if [[ ${CHOST} == *-darwin* ]]; then - toolset=darwin - else - # Using boost's generic toolset here, which respects CC and CFLAGS - toolset=cc - fi - - CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${ESYSROOT}"/usr) || die "building bjam failed" -} - -src_test() { - cd ../test || die - - local -x TMP="${T}" - - DO_DIFF="${EPREFIX}/usr/bin/diff" "${EPYTHON}" test_all.py - - if [[ -s test_results.txt ]]; then - eerror "At least one test failed: $(<test_results.txt)" - die "tests failed" - fi -} - -src_install() { - dobin engine/bin.*/{bjam,b2} - - insinto /usr/share/boost-build - doins -r "${FILESDIR}/site-config.jam" \ - ../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \ - build kernel options tools util - - if ! use python; then - find "${ED}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed" - fi - - 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-util/boost-build/boost-build-1.71.0.ebuild b/dev-util/boost-build/boost-build-1.71.0.ebuild index 641d9b8e3999..3c8845c89132 100644 --- a/dev-util/boost-build/boost-build-1.71.0.ebuild +++ b/dev-util/boost-build/boost-build-1.71.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar LICENSE="Boost-1.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="examples python test" RESTRICT="test" @@ -34,11 +34,11 @@ REQUIRED_USE=" S="${WORKDIR}/boost_${MY_PV}/tools/build/src" PATCHES=( - "${FILESDIR}"/${PN}-1.48.0-disable_python_rpath.patch - "${FILESDIR}"/${PN}-1.49.0-darwin-gentoo-toolchain.patch - "${FILESDIR}"/${PN}-1.62.0-sparc-no-default-flags.patch - "${FILESDIR}"/${PN}-1.66.0-add-none-feature-options.patch + "${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch + "${FILESDIR}"/${PN}-1.71.0-darwin-gentoo-toolchain.patch + "${FILESDIR}"/${PN}-1.71.0-add-none-feature-options.patch "${FILESDIR}"/${PN}-1.71.0-respect-c_ld-flags.patch + "${FILESDIR}"/${PN}-1.71.0-no-implicit-march-flags.patch ) pkg_setup() { @@ -55,18 +55,8 @@ src_prepare() { default pushd .. >/dev/null || die - eapply "${FILESDIR}/${PN}-1.54.0-fix-test.patch" + eapply "${FILESDIR}"/${PN}-1.71.0-fix-test.patch popd >/dev/null || die - - # remove default -march/-mcpu definitions - # bjam is trying to be clever and injects -march= in order to - # optimize code for you. This breaks on 32-bit builds, because - # -march=i686 will not work on an i486 CHOST. - # https://bugs.gentoo.org/624616 - sed -e '/^cpu-flags\s*gcc\s*OPTIONS/d' \ - -e '/toolset\.flags\s*gcc\s*OPTIONS/d' \ - -e "/cpu_flags('gcc',\s*'OPTIONS'/d" \ - -i tools/gcc.{jam,py} || die "Failed removing -march/-mcpu" } src_configure() { diff --git a/dev-util/boost-build/boost-build-1.72.0.ebuild b/dev-util/boost-build/boost-build-1.72.0.ebuild new file mode 100644 index 000000000000..00a3c7d53ddf --- /dev/null +++ b/dev-util/boost-build/boost-build-1.72.0.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic prefix toolchain-funcs + +MY_PV="$(ver_rs 1- _)" + +DESCRIPTION="A system for large project software construction, simple to use and powerful" +HOMEPAGE="https://boostorg.github.io/build/" +SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2" + +LICENSE="Boost-1.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="examples" +RESTRICT="test" + +S="${WORKDIR}/boost_${MY_PV}/tools/build/src" + +PATCHES=( + "${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch + "${FILESDIR}"/${PN}-1.71.0-darwin-gentoo-toolchain.patch + "${FILESDIR}"/${PN}-1.71.0-add-none-feature-options.patch + "${FILESDIR}"/${PN}-1.71.0-respect-c_ld-flags.patch + "${FILESDIR}"/${PN}-1.71.0-no-implicit-march-flags.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() { + hprefixify engine/Jambase + tc-export CXX +} + +src_compile() { + cd engine || die + ./build.sh cxx -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 + 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 -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-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch b/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch deleted file mode 100644 index 8775583cbc00..000000000000 --- a/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- a/engine/build.jam -+++ b/engine/build.jam -@@ -3,7 +3,7 @@ - #~ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - - # Clean env vars of any "extra" empty values. --for local v in ARGV CC CFLAGS LIBS -+for local v in ARGV CC CFLAGS LDFLAGS LIBS - { - local values ; - for local x in $($(v)) -@@ -179,10 +179,10 @@ - if ! $(CC) { CC = cc ; } - toolset cc $(CC) : "-o " : -D - : $(CFLAGS) -- [ opt --release : -s -O ] -+ [ opt --release : ] - [ opt --debug : -g ] - -I$(--python-include) -I$(--extra-include) -- : $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ; -+ : $(LDFLAGS) $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ; - ## Comeau C/C++ 4.x - toolset como como : "-o " : -D - : --c -@@ -201,11 +201,11 @@ - ## MacOSX Darwin, using GCC 2.9.x, 3.x - toolset darwin cc : "-o " : -D - : -- [ opt --release : -Wl,-x -O3 -finline-functions ] -+ [ opt --release : -Wl,-x -finline-functions ] - [ opt --debug : -g -O0 -fno-inline -pg ] - [ opt --profile : -Wl,-x -O3 -finline-functions -g -pg ] - -I$(--python-include) -I$(--extra-include) -- : -L$(--python-lib[1]) -l$(--python-lib[2]) ; -+ : $(LDFLAGS) -L$(--python-lib[1]) -l$(--python-lib[2]) ; - ## GCC 2.x, 3.x, 4.x - toolset gcc gcc : "-o " : -D - : -pedantic -fno-strict-aliasing ---- a/engine/build.sh -+++ b/engine/build.sh -@@ -224,9 +224,9 @@ - cc) - if test -z "$CC" ; then CC=cc ; fi - BOOST_JAM_CC=$CC -- BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LIBS" -- BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LIBS" -- BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LIBS" -+ BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LDFLAGS $LIBS" -+ BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LDFLAGS $LIBS" -+ BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LDFLAGS $LIBS" - ;; - - qcc) diff --git a/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch b/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch deleted file mode 100644 index cacbe00a7ef9..000000000000 --- a/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch +++ /dev/null @@ -1,17 +0,0 @@ -Don't look for the framework path, we build Python the UNIX way for -Gentoo Prefix - ---- a/engine/build.jam -+++ b/engine/build.jam -@@ -82,11 +82,6 @@ - } - --python-lib = $(--python-lib[1]) ; - } -- else if $(OS) = MACOSX -- { -- --python-include = [ .path $(python-location) Headers ] ; -- --python-lib = $(python-location) Python ; -- } - else - { - --python-include = ; diff --git a/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch b/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch deleted file mode 100644 index a04aa0b7aab1..000000000000 --- a/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/tools/common.jam -+++ b/tools/common.jam -@@ -763,7 +763,15 @@ - switch $(f:G) - { - case <base> : -- result += $(name:B) ; -+ local matched = [ MATCH "^(boost.*python)-.*" : $(name) ] ; -+ if $(matched) = boost_python || $(matched) = boost_mpi_python -+ { -+ result += $(name) ; -+ } -+ else -+ { -+ result += $(name:B) ; -+ } - - case <toolset> : - result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) : diff --git a/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch b/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch deleted file mode 100644 index d8b6a5af1e9c..000000000000 --- a/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://svn.boost.org/trac/boost/ticket/10122 - ---- a/engine/mem.h -+++ b/engine/mem.h -@@ -8,6 +8,8 @@ - #ifndef BJAM_MEM_H - #define BJAM_MEM_H - -+#include "jam.h" -+ - #ifdef OPT_BOEHM_GC - - /* Use Boehm GC memory allocator. */ diff --git a/dev-util/boost-build/files/boost-build-1.62.0-sparc-no-default-flags.patch b/dev-util/boost-build/files/boost-build-1.62.0-sparc-no-default-flags.patch deleted file mode 100644 index a3f450b0edf1..000000000000 --- a/dev-util/boost-build/files/boost-build-1.62.0-sparc-no-default-flags.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/tools/gcc.py 2018-09-07 17:44:59.668796217 +0200 -+++ b/tools/gcc.py 2018-09-07 17:45:56.378794314 +0200 -@@ -811,20 +811,6 @@ - # Sparc - flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>32'], ['-m32']) - flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>64'], ['-m64']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'v7', ['-mcpu=v7'], default=True) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'cypress', ['-mcpu=cypress']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'v8', ['-mcpu=v8']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'supersparc', ['-mcpu=supersparc']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite', ['-mcpu=sparclite']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'hypersparc', ['-mcpu=hypersparc']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite86x', ['-mcpu=sparclite86x']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'f930', ['-mcpu=f930']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'f934', ['-mcpu=f934']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclet', ['-mcpu=sparclet']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'tsc701', ['-mcpu=tsc701']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'v9', ['-mcpu=v9']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc', ['-mcpu=ultrasparc']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc3', ['-mcpu=ultrasparc3']) - # RS/6000 & PowerPC - flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>32'], ['-m32']) - flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>64'], ['-m64']) ---- a/tools/gcc.jam 2018-09-07 17:45:12.168795797 +0200 -+++ b/tools/gcc.jam 2018-09-07 17:46:25.498793337 +0200 -@@ -1134,21 +1134,6 @@ - cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ; - ## - cpu-flags gcc OPTIONS : x86 : atom : -march=atom ; --# Sparc --cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ; --cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ; --cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ; --cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ; --cpu-flags gcc OPTIONS : sparc : sparclite : -mcpu=sparclite ; --cpu-flags gcc OPTIONS : sparc : hypersparc : -mcpu=hypersparc ; --cpu-flags gcc OPTIONS : sparc : sparclite86x : -mcpu=sparclite86x ; --cpu-flags gcc OPTIONS : sparc : f930 : -mcpu=f930 ; --cpu-flags gcc OPTIONS : sparc : f934 : -mcpu=f934 ; --cpu-flags gcc OPTIONS : sparc : sparclet : -mcpu=sparclet ; --cpu-flags gcc OPTIONS : sparc : tsc701 : -mcpu=tsc701 ; --cpu-flags gcc OPTIONS : sparc : v9 : -mcpu=v9 ; --cpu-flags gcc OPTIONS : sparc : ultrasparc : -mcpu=ultrasparc ; --cpu-flags gcc OPTIONS : sparc : ultrasparc3 : -mcpu=ultrasparc3 ; - # RS/6000 & PowerPC - cpu-flags gcc OPTIONS : power : 403 : -mcpu=403 ; - cpu-flags gcc OPTIONS : power : 505 : -mcpu=505 ; diff --git a/dev-util/boost-build/files/boost-build-1.66.0-add-none-feature-options.patch b/dev-util/boost-build/files/boost-build-1.71.0-add-none-feature-options.patch index fd86c9e2fc71..ddd1641d15cc 100644 --- a/dev-util/boost-build/files/boost-build-1.66.0-add-none-feature-options.patch +++ b/dev-util/boost-build/files/boost-build-1.71.0-add-none-feature-options.patch @@ -1,5 +1,3 @@ -diff --git a/tools/features/debug-feature.jam b/tools/features/debug-feature.jam -index 04958f9a..38b6acf1 100644 --- a/tools/features/debug-feature.jam +++ b/tools/features/debug-feature.jam @@ -8,7 +8,7 @@ @@ -11,8 +9,6 @@ index 04958f9a..38b6acf1 100644 : propagated ; feature.feature profiling -diff --git a/tools/features/optimization-feature.jam b/tools/features/optimization-feature.jam -index 761f76f1..fb2a5dec 100644 --- a/tools/features/optimization-feature.jam +++ b/tools/features/optimization-feature.jam @@ -8,7 +8,7 @@ diff --git a/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch b/dev-util/boost-build/files/boost-build-1.71.0-darwin-gentoo-toolchain.patch index 032feaf9625f..3693677540a4 100644 --- a/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch +++ b/dev-util/boost-build/files/boost-build-1.71.0-darwin-gentoo-toolchain.patch @@ -4,7 +4,7 @@ arch, etc. --- a/tools/darwin.jam +++ b/tools/darwin.jam -@@ -227,6 +227,9 @@ +@@ -239,6 +239,9 @@ } } @@ -14,7 +14,7 @@ arch, etc. if $(version-feature) { if $(.debug-configuration) -@@ -387,7 +390,8 @@ +@@ -447,7 +450,8 @@ support-ppc64 = ; } } diff --git a/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch b/dev-util/boost-build/files/boost-build-1.71.0-disable_python_rpath.patch index 84734f7473fe..b7b47cc93a47 100644 --- a/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch +++ b/dev-util/boost-build/files/boost-build-1.71.0-disable_python_rpath.patch @@ -1,6 +1,6 @@ --- a/tools/python.jam +++ b/tools/python.jam -@@ -961,7 +961,7 @@ +@@ -1000,7 +1000,7 @@ # linux). : $(usage-requirements) <testing.launcher>$(set-PYTHONPATH) diff --git a/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch b/dev-util/boost-build/files/boost-build-1.71.0-fix-test.patch index 3f8b177c7102..3f8b177c7102 100644 --- a/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch +++ b/dev-util/boost-build/files/boost-build-1.71.0-fix-test.patch diff --git a/dev-util/boost-build/files/boost-build-1.71.0-no-implicit-march-flags.patch b/dev-util/boost-build/files/boost-build-1.71.0-no-implicit-march-flags.patch new file mode 100644 index 000000000000..cd184030deeb --- /dev/null +++ b/dev-util/boost-build/files/boost-build-1.71.0-no-implicit-march-flags.patch @@ -0,0 +1,266 @@ +Prevent bjam from injecting what it thinks are great -march/-mcpu flags +in order to optimize code for you. This breaks on 32-bit builds, because +-march=i686 will not work on an i486 CHOST. + +See also: +https://bugs.gentoo.org/624616 + +--- a/tools/gcc.jam ++++ b/tools/gcc.jam +@@ -1187,128 +1187,8 @@ + # 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. +-toolset.flags gcc OPTIONS <architecture>x86/<address-model>32/<instruction-set> : -march=i686 ; +-cpu-flags gcc OPTIONS : x86 : native : -march=native ; +-cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ; +-cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ; +-cpu-flags gcc OPTIONS : x86 : i686 : -march=i686 ; +-cpu-flags gcc OPTIONS : x86 : pentium : -march=pentium ; +-cpu-flags gcc OPTIONS : x86 : pentium-mmx : -march=pentium-mmx ; +-cpu-flags gcc OPTIONS : x86 : pentiumpro : -march=pentiumpro ; +-cpu-flags gcc OPTIONS : x86 : pentium2 : -march=pentium2 ; +-cpu-flags gcc OPTIONS : x86 : pentium3 : -march=pentium3 ; +-cpu-flags gcc OPTIONS : x86 : pentium3m : -march=pentium3m ; +-cpu-flags gcc OPTIONS : x86 : pentium-m : -march=pentium-m ; +-cpu-flags gcc OPTIONS : x86 : pentium4 : -march=pentium4 ; +-cpu-flags gcc OPTIONS : x86 : pentium4m : -march=pentium4m ; +-cpu-flags gcc OPTIONS : x86 : prescott : -march=prescott ; +-cpu-flags gcc OPTIONS : x86 : nocona : -march=nocona ; +-cpu-flags gcc OPTIONS : x86 : core2 : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : conroe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : conroe-xe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : conroe-l : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : allendale : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : wolfdale : -march=core2 -msse4.1 ; +-cpu-flags gcc OPTIONS : x86 : merom : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : merom-xe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : kentsfield : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : kentsfield-xe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : yorksfield : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : penryn : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : corei7 : -march=corei7 ; +-cpu-flags gcc OPTIONS : x86 : nehalem : -march=corei7 ; +-cpu-flags gcc OPTIONS : x86 : corei7-avx : -march=corei7-avx ; +-cpu-flags gcc OPTIONS : x86 : sandy-bridge : -march=corei7-avx ; +-cpu-flags gcc OPTIONS : x86 : core-avx-i : -march=core-avx-i ; +-cpu-flags gcc OPTIONS : x86 : ivy-bridge : -march=core-avx-i ; +-cpu-flags gcc OPTIONS : x86 : haswell : -march=core-avx-i -mavx2 -mfma -mbmi -mbmi2 -mlzcnt ; +-cpu-flags gcc OPTIONS : x86 : broadwell : -march=broadwell ; +-cpu-flags gcc OPTIONS : x86 : skylake : -march=skylake ; +-cpu-flags gcc OPTIONS : x86 : skylake-avx512 : -march=skylake-avx512 ; +-cpu-flags gcc OPTIONS : x86 : cannonlake : -march=skylake-avx512 -mavx512vbmi -mavx512ifma -msha ; +-cpu-flags gcc OPTIONS : x86 : icelake : -march=icelake ; +-cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ; +-cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ; +-cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ; +-cpu-flags gcc OPTIONS : x86 : athlon : -march=athlon ; +-cpu-flags gcc OPTIONS : x86 : athlon-tbird : -march=athlon-tbird ; +-cpu-flags gcc OPTIONS : x86 : athlon-4 : -march=athlon-4 ; +-cpu-flags gcc OPTIONS : x86 : athlon-xp : -march=athlon-xp ; +-cpu-flags gcc OPTIONS : x86 : athlon-mp : -march=athlon-mp ; + ## +-cpu-flags gcc OPTIONS : x86 : k8 : -march=k8 ; +-cpu-flags gcc OPTIONS : x86 : opteron : -march=opteron ; +-cpu-flags gcc OPTIONS : x86 : athlon64 : -march=athlon64 ; +-cpu-flags gcc OPTIONS : x86 : athlon-fx : -march=athlon-fx ; +-cpu-flags gcc OPTIONS : x86 : k8-sse3 : -march=k8-sse3 ; +-cpu-flags gcc OPTIONS : x86 : opteron-sse3 : -march=opteron-sse3 ; +-cpu-flags gcc OPTIONS : x86 : athlon64-sse3 : -march=athlon64-sse3 ; +-cpu-flags gcc OPTIONS : x86 : amdfam10 : -march=amdfam10 ; +-cpu-flags gcc OPTIONS : x86 : barcelona : -march=barcelona ; +-cpu-flags gcc OPTIONS : x86 : bdver1 : -march=bdver1 ; +-cpu-flags gcc OPTIONS : x86 : bdver2 : -march=bdver2 ; +-cpu-flags gcc OPTIONS : x86 : bdver3 : -march=bdver3 ; +-cpu-flags gcc OPTIONS : x86 : bdver4 : -march=bdver4 ; +-cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ; +-cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ; +-cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ; +-cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ; +-cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ; +-cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ; +-cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ; + ## +-cpu-flags gcc OPTIONS : x86 : atom : -march=atom ; +-# Sparc +-cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ; +-cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ; +-cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ; +-cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ; +-cpu-flags gcc OPTIONS : sparc : sparclite : -mcpu=sparclite ; +-cpu-flags gcc OPTIONS : sparc : hypersparc : -mcpu=hypersparc ; +-cpu-flags gcc OPTIONS : sparc : sparclite86x : -mcpu=sparclite86x ; +-cpu-flags gcc OPTIONS : sparc : f930 : -mcpu=f930 ; +-cpu-flags gcc OPTIONS : sparc : f934 : -mcpu=f934 ; +-cpu-flags gcc OPTIONS : sparc : sparclet : -mcpu=sparclet ; +-cpu-flags gcc OPTIONS : sparc : tsc701 : -mcpu=tsc701 ; +-cpu-flags gcc OPTIONS : sparc : v9 : -mcpu=v9 ; +-cpu-flags gcc OPTIONS : sparc : ultrasparc : -mcpu=ultrasparc ; +-cpu-flags gcc OPTIONS : sparc : ultrasparc3 : -mcpu=ultrasparc3 ; + # RS/6000 & PowerPC +-cpu-flags gcc OPTIONS : power : 403 : -mcpu=403 ; +-cpu-flags gcc OPTIONS : power : 505 : -mcpu=505 ; +-cpu-flags gcc OPTIONS : power : 601 : -mcpu=601 ; +-cpu-flags gcc OPTIONS : power : 602 : -mcpu=602 ; +-cpu-flags gcc OPTIONS : power : 603 : -mcpu=603 ; +-cpu-flags gcc OPTIONS : power : 603e : -mcpu=603e ; +-cpu-flags gcc OPTIONS : power : 604 : -mcpu=604 ; +-cpu-flags gcc OPTIONS : power : 604e : -mcpu=604e ; +-cpu-flags gcc OPTIONS : power : 620 : -mcpu=620 ; +-cpu-flags gcc OPTIONS : power : 630 : -mcpu=630 ; +-cpu-flags gcc OPTIONS : power : 740 : -mcpu=740 ; +-cpu-flags gcc OPTIONS : power : 7400 : -mcpu=7400 ; +-cpu-flags gcc OPTIONS : power : 7450 : -mcpu=7450 ; +-cpu-flags gcc OPTIONS : power : 750 : -mcpu=750 ; +-cpu-flags gcc OPTIONS : power : 801 : -mcpu=801 ; +-cpu-flags gcc OPTIONS : power : 821 : -mcpu=821 ; +-cpu-flags gcc OPTIONS : power : 823 : -mcpu=823 ; +-cpu-flags gcc OPTIONS : power : 860 : -mcpu=860 ; +-cpu-flags gcc OPTIONS : power : 970 : -mcpu=970 ; +-cpu-flags gcc OPTIONS : power : 8540 : -mcpu=8540 ; +-cpu-flags gcc OPTIONS : power : power : -mcpu=power ; +-cpu-flags gcc OPTIONS : power : power2 : -mcpu=power2 ; +-cpu-flags gcc OPTIONS : power : power3 : -mcpu=power3 ; +-cpu-flags gcc OPTIONS : power : power4 : -mcpu=power4 ; +-cpu-flags gcc OPTIONS : power : power5 : -mcpu=power5 ; +-cpu-flags gcc OPTIONS : power : powerpc : -mcpu=powerpc ; +-cpu-flags gcc OPTIONS : power : powerpc64 : -mcpu=powerpc64 ; +-cpu-flags gcc OPTIONS : power : rios : -mcpu=rios ; +-cpu-flags gcc OPTIONS : power : rios1 : -mcpu=rios1 ; +-cpu-flags gcc OPTIONS : power : rios2 : -mcpu=rios2 ; +-cpu-flags gcc OPTIONS : power : rsc : -mcpu=rsc ; +-cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ; +-cpu-flags gcc OPTIONS : s390x : z196 : -march=z196 ; +-cpu-flags gcc OPTIONS : s390x : zEC12 : -march=zEC12 ; +-cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ; +-cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ; + # AIX variant of RS/6000 & PowerPC + toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; +--- a/tools/gcc.py ++++ b/tools/gcc.py +@@ -745,125 +745,14 @@ + # x86 and compatible + flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>32'], ['-m32']) + flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>64'], ['-m64']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'native', ['-march=native']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'i486', ['-march=i486']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'i586', ['-march=i586']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'i686', ['-march=i686'], default=True) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium', ['-march=pentium']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium-mmx', ['-march=pentium-mmx']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentiumpro', ['-march=pentiumpro']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium2', ['-march=pentium2']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium3', ['-march=pentium3']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium3m', ['-march=pentium3m']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium-m', ['-march=pentium-m']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium4', ['-march=pentium4']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium4m', ['-march=pentium4m']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'prescott', ['-march=prescott']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'nocona', ['-march=nocona']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'core2', ['-march=core2']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe', ['-march=core2']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe-xe', ['-march=core2']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe-l', ['-march=core2']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'allendale', ['-march=core2']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'wolfdale', ['-march=core2', '-msse4.1']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'merom', ['-march=core2']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'merom-xe', ['-march=core2']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'kentsfield', ['-march=core2']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'kentsfield-xe', ['-march=core2']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'yorksfield', ['-march=core2']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'penryn', ['-march=core2']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'corei7', ['-march=corei7']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'nehalem', ['-march=corei7']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'corei7-avx', ['-march=corei7-avx']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'sandy-bridge', ['-march=corei7-avx']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'core-avx-i', ['-march=core-avx-i']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'ivy-bridge', ['-march=core-avx-i']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'haswell', ['-march=core-avx-i', '-mavx2', '-mfma', '-mbmi', '-mbmi2', '-mlzcnt']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'k6', ['-march=k6']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'k6-2', ['-march=k6-2']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'k6-3', ['-march=k6-3']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon', ['-march=athlon']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-tbird', ['-march=athlon-tbird']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-4', ['-march=athlon-4']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-xp', ['-march=athlon-xp']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-mp', ['-march=athlon-mp']) + ## +-cpu_flags('gcc', 'OPTIONS', 'x86', 'k8', ['-march=k8']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'opteron', ['-march=opteron']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon64', ['-march=athlon64']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-fx', ['-march=athlon-fx']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'k8-sse3', ['-march=k8-sse3']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'opteron-sse3', ['-march=opteron-sse3']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon64-sse3', ['-march=athlon64-sse3']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'amdfam10', ['-march=amdfam10']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'barcelona', ['-march=barcelona']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver1', ['-march=bdver1']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver2', ['-march=bdver2']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver3', ['-march=bdver3']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'btver1', ['-march=btver1']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'btver2', ['-march=btver2']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'winchip-c6', ['-march=winchip-c6']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'winchip2', ['-march=winchip2']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'c3', ['-march=c3']) +-cpu_flags('gcc', 'OPTIONS', 'x86', 'c3-2', ['-march=c3-2']) + ## +-cpu_flags('gcc', 'OPTIONS', 'x86', 'atom', ['-march=atom']) + # Sparc + flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>32'], ['-m32']) + flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>64'], ['-m64']) +-cpu_flags('gcc', 'OPTIONS', 'sparc', 'v7', ['-mcpu=v7'], default=True) +-cpu_flags('gcc', 'OPTIONS', 'sparc', 'cypress', ['-mcpu=cypress']) +-cpu_flags('gcc', 'OPTIONS', 'sparc', 'v8', ['-mcpu=v8']) +-cpu_flags('gcc', 'OPTIONS', 'sparc', 'supersparc', ['-mcpu=supersparc']) +-cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite', ['-mcpu=sparclite']) +-cpu_flags('gcc', 'OPTIONS', 'sparc', 'hypersparc', ['-mcpu=hypersparc']) +-cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite86x', ['-mcpu=sparclite86x']) +-cpu_flags('gcc', 'OPTIONS', 'sparc', 'f930', ['-mcpu=f930']) +-cpu_flags('gcc', 'OPTIONS', 'sparc', 'f934', ['-mcpu=f934']) +-cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclet', ['-mcpu=sparclet']) +-cpu_flags('gcc', 'OPTIONS', 'sparc', 'tsc701', ['-mcpu=tsc701']) +-cpu_flags('gcc', 'OPTIONS', 'sparc', 'v9', ['-mcpu=v9']) +-cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc', ['-mcpu=ultrasparc']) +-cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc3', ['-mcpu=ultrasparc3']) + # RS/6000 & PowerPC + flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>32'], ['-m32']) + flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>64'], ['-m64']) +-cpu_flags('gcc', 'OPTIONS', 'power', '403', ['-mcpu=403']) +-cpu_flags('gcc', 'OPTIONS', 'power', '505', ['-mcpu=505']) +-cpu_flags('gcc', 'OPTIONS', 'power', '601', ['-mcpu=601']) +-cpu_flags('gcc', 'OPTIONS', 'power', '602', ['-mcpu=602']) +-cpu_flags('gcc', 'OPTIONS', 'power', '603', ['-mcpu=603']) +-cpu_flags('gcc', 'OPTIONS', 'power', '603e', ['-mcpu=603e']) +-cpu_flags('gcc', 'OPTIONS', 'power', '604', ['-mcpu=604']) +-cpu_flags('gcc', 'OPTIONS', 'power', '604e', ['-mcpu=604e']) +-cpu_flags('gcc', 'OPTIONS', 'power', '620', ['-mcpu=620']) +-cpu_flags('gcc', 'OPTIONS', 'power', '630', ['-mcpu=630']) +-cpu_flags('gcc', 'OPTIONS', 'power', '740', ['-mcpu=740']) +-cpu_flags('gcc', 'OPTIONS', 'power', '7400', ['-mcpu=7400']) +-cpu_flags('gcc', 'OPTIONS', 'power', '7450', ['-mcpu=7450']) +-cpu_flags('gcc', 'OPTIONS', 'power', '750', ['-mcpu=750']) +-cpu_flags('gcc', 'OPTIONS', 'power', '801', ['-mcpu=801']) +-cpu_flags('gcc', 'OPTIONS', 'power', '821', ['-mcpu=821']) +-cpu_flags('gcc', 'OPTIONS', 'power', '823', ['-mcpu=823']) +-cpu_flags('gcc', 'OPTIONS', 'power', '860', ['-mcpu=860']) +-cpu_flags('gcc', 'OPTIONS', 'power', '970', ['-mcpu=970']) +-cpu_flags('gcc', 'OPTIONS', 'power', '8540', ['-mcpu=8540']) +-cpu_flags('gcc', 'OPTIONS', 'power', 'power', ['-mcpu=power']) +-cpu_flags('gcc', 'OPTIONS', 'power', 'power2', ['-mcpu=power2']) +-cpu_flags('gcc', 'OPTIONS', 'power', 'power3', ['-mcpu=power3']) +-cpu_flags('gcc', 'OPTIONS', 'power', 'power4', ['-mcpu=power4']) +-cpu_flags('gcc', 'OPTIONS', 'power', 'power5', ['-mcpu=power5']) +-cpu_flags('gcc', 'OPTIONS', 'power', 'powerpc', ['-mcpu=powerpc']) +-cpu_flags('gcc', 'OPTIONS', 'power', 'powerpc64', ['-mcpu=powerpc64']) +-cpu_flags('gcc', 'OPTIONS', 'power', 'rios', ['-mcpu=rios']) +-cpu_flags('gcc', 'OPTIONS', 'power', 'rios1', ['-mcpu=rios1']) +-cpu_flags('gcc', 'OPTIONS', 'power', 'rios2', ['-mcpu=rios2']) +-cpu_flags('gcc', 'OPTIONS', 'power', 'rsc', ['-mcpu=rsc']) +-cpu_flags('gcc', 'OPTIONS', 'power', 'rs64a', ['-mcpu=rs64']) +-cpu_flags('gcc', 'OPTIONS', 's390x', 'z196', ['-march=z196']) +-cpu_flags('gcc', 'OPTIONS', 's390x', 'zEC12', ['-march=zEC12']) +-cpu_flags('gcc', 'OPTIONS', 's390x', 'z13', ['-march=z13']) +-cpu_flags('gcc', 'OPTIONS', 's390x', 'z14', ['-march=z14']) + # AIX variant of RS/6000 & PowerPC + flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>32/<target-os>aix'], ['-maix32']) + flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>64/<target-os>aix'], ['-maix64']) |