diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-10-08 23:06:07 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-08 23:06:07 +0100 |
| commit | e23a08d0c97a0cc415aaa165da840b056f93c997 (patch) | |
| tree | 4c5f7db60483518201fef36f8cc0712789a08db2 /dev-util/scons | |
| parent | 391b5b359a346aff490103da7dddc85047f83830 (diff) | |
gentoo resync : 08.10.2021
Diffstat (limited to 'dev-util/scons')
| -rw-r--r-- | dev-util/scons/Manifest | 2 | ||||
| -rw-r--r-- | dev-util/scons/scons-4.2.0-r1.ebuild | 22 |
2 files changed, 21 insertions, 3 deletions
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest index 3a08766be4d9..f6021a473765 100644 --- a/dev-util/scons/Manifest +++ b/dev-util/scons/Manifest @@ -10,5 +10,5 @@ DIST scons-4.2.0-user.pdf 2813567 BLAKE2B 2787c9dbecaefccc5f4df2bcccc474ee69e988 DIST scons-4.2.0.gh.tar.gz 5677165 BLAKE2B c298152db937810ab73afc304a9dc480c185ef0d6e86be5ec7f2022a7d1ed4d3df6ecc18148c3143d4e76a7ea0e50790db1224e66db68bace0759daba7f36a91 SHA512 138573f7203b52fad0527d8d88ceabe182273eff7e4b74125e0d7eda51c44408b07e2c702ee63214519392101d8bbb30013e6d34000eaeb530a816c17396de97 DIST scons-4.2.0.tar.gz 3043008 BLAKE2B 3e69189e45b8ecc956419d3b7d4d36a78ffe219ff87a18d17c511434cf4306635c245107e7978d8f6b86f65bd2ac028fa3c76ab1212806a692d355d7d8036645 SHA512 91d77c858a888621d41432f39970547830997c8e28a851bbab7c0f181afda564abef321befaa33cbe6fd5fc4ac85fa80f2349994956edcc99c027cf7f526bbf0 EBUILD scons-4.1.0-r1.ebuild 2764 BLAKE2B 0add0564bc259cee0d3dc5b4121577e329257d62c02c9811f1df5df680402563cdbab7fd118c585c5b4dde333d1a96c69dc4f04b4785b92b4852e40136fd0409 SHA512 cbcc1e83478eb60778e7512dd3268d064fc1e96acfc47ee598b68064acd9b44e262c2d675d5c0383d632014174036bd9b9886f8e320464d9fbcbe2572dd1f494 -EBUILD scons-4.2.0-r1.ebuild 2886 BLAKE2B 8a36d15b5512b6c0830d967f12aa1f44085cd1804bcad304f31883da4c2fdf2adf83e7a9e87995f0cb85c8511431157eab0c065bff6a7409a5d76b5b3cc7600e SHA512 2023ab17883083ca597c1c659507f714f226da1fcf755e07d2c145f41e3a9215dd241bd425144463f113797c93ed2b4fbf1ce6ae5302e0b34acce34d28f0327a +EBUILD scons-4.2.0-r1.ebuild 3540 BLAKE2B df5ca824bfab688ea4159bf7ed34d59e8dc02b548e0b8184b3dc344d5bdc0bd33fd278b570f42ade797ef2290ed1e321c16427654f4c385d76624e4afed0cb4e SHA512 351390df8c5042c0cce46daee1c75d585dd742e410378445ec23ec2dca5167d224b552c888d9cbfa9e78145e766269e827c396e317c21ad51a2950256dcdcb5c MISC metadata.xml 705 BLAKE2B c2c0722d7a0a382c218f101c0219deac4b335d1dc0a0038f27b7e920b37e4fdad2c7524f0463182a2495c04f9679f511b8a2b92982ee7ffc3cad985cfabf1e80 SHA512 5b127afcc07795487bb4856d942e0a34402c609147256dc457f5919d75a8fbf3f0bfca0c3a5f61d78a1152ee56967d1f48eac670dc12ce292ae964d692c497dd diff --git a/dev-util/scons/scons-4.2.0-r1.ebuild b/dev-util/scons/scons-4.2.0-r1.ebuild index d4f1339f581a..5a28706a03d0 100644 --- a/dev-util/scons/scons-4.2.0-r1.ebuild +++ b/dev-util/scons/scons-4.2.0-r1.ebuild @@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend PYTHON_COMPAT=( python3_{8..9} ) PYTHON_REQ_USE="threads(+)" -inherit distutils-r1 +inherit distutils-r1 multiprocessing DESCRIPTION="Extensible Python-based build utility" HOMEPAGE="https://www.scons.org/" @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="MIT" 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 ~x64-solaris ~x86-solaris" +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 ~x64-solaris ~x86-solaris" IUSE="doc test" RESTRICT="!test? ( test )" @@ -73,6 +73,24 @@ src_prepare() { test/option/option-v.py test/Interactive/version.py ) + + if ! use amd64 && ! use x86 ; then + # These tests are currently broken on arm and other non-amd64/x86 platforms + # Work seems to be ongoing in e.g. https://github.com/SCons/scons/pull/4022 to + # better plumb up the MSVC tests for alternative arches. + # Try again after 4.2.0. + # See also: https://pairlist4.pair.net/pipermail/scons-users/2020-November/008452.html + # bug #757534 + remove_tests+=( + test/MSVS/vs-7.0-scc-files.py + test/MSVS/vs-7.0-scc-legacy-files.py + test/MSVS/vs-7.1-scc-files.py + test/MSVS/vs-7.1-scc-legacy-files.py + test/MSVS/vs-scc-files.py + test/MSVS/vs-scc-legacy-files.py + ) + fi + rm -r "${remove_tests[@]}" || die fi } |