* [gentoo-commits] repo/gentoo:master commit in: dev-util/scons/files/, dev-util/scons/
@ 2015-11-11 10:37 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2015-11-11 10:37 UTC (permalink / raw
To: gentoo-commits
commit: 13fc6dd2837f03d55693198c7b256d443cbbecfc
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 11 10:36:33 2015 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 10:36:57 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13fc6dd2
dev-util/scons: Removed old.
Package-Manager: portage-2.2.24
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
dev-util/scons/Manifest | 6 ---
dev-util/scons/files/scons-1.2.0-popen.patch | 58 ------------------------
dev-util/scons/files/scons-install-scripts.patch | 20 --------
dev-util/scons/scons-2.3.0.ebuild | 56 -----------------------
dev-util/scons/scons-2.3.4.ebuild | 53 ----------------------
5 files changed, 193 deletions(-)
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index c2d67e5..5b2aeaf 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,9 +1,3 @@
-DIST scons-2.3.0-user.html 1006588 SHA256 64b52ed0ccad52ee7d57188934ee4326ddd8dd387d8283445367265084be8db4 SHA512 42dd7604548aa2f859c8fad8ea802e69a2e139b5a53804a0d855868d056194497653a7124d46a25eba6cdb6339dc16288311faefe8f5240dfa1c210260f27e6c WHIRLPOOL 6f5a164621e5a46f1ab256f6a4db192a9b1bda0de292859b7fc22f1feb31e1c47ca0281ee558b49d807b1224cd89028b4b6799a5abcd125cd440a1e9e00c817f
-DIST scons-2.3.0-user.pdf 2268686 SHA256 9b8eb3ed9ad40b375628417d39823042939c8f52f32d0f76c796107870a98c11 SHA512 ae94950bec28d88f83d01590db18ce776146d20dcfa756b0ce2f582f4c729c75eb4f7c57584f624bb653fb43dbf34c972f6a0dcc36aa1b338403885e2d177798 WHIRLPOOL 41dd9909f0b110f2dfd9369ac3f44b5b6a3ff5ae99d3caabb3aa0a92084b92d4b03c45923a8e52cfe18a4ca4f0184e4ddaa57545a6cac6a9ade42f748bc1d8f3
-DIST scons-2.3.0.tar.gz 599514 SHA256 9442069999cf4b2caa94a5886ab4c2c71de1718ed5e9176c18e2b6dbca463b4b SHA512 a7e88bb70b8b269337689fb4afd9563359f6ace37857bbd9824c9e40e43cac8b1e00468d8652bb9b46e410f6b161cb8c9006dd1fd9265756be153846a5e0fd65 WHIRLPOOL 948cc117fe40ab36f3862fab8322268dcb95ecbcde0397d684f31f5deedbbcff3f880d7af336710f237031df350eddcde81a044133b7b61bf5088c4c62ec70cf
-DIST scons-2.3.4-user.html 1078749 SHA256 d2cab40df012d1fcf5f7e79d0fc097d5acd2c9ae1659db787a4b5786980f7355 SHA512 75d93d93831bde615cb028dac31184394d4a2478ade5730e0f82ad0ded0a4e868f7981d047ec4b7037e97ea6cfb4fa52d51cb161e64938b21bb96fd3fa373038 WHIRLPOOL 835f2492c0ae6cfec058b0556a79c2f15c6c09cf46faae1e2678dabf30247d6b9d6b9b525105f5abd7ce77d03b473cdb2ba149cdc2114944722ef25d7464dce2
-DIST scons-2.3.4-user.pdf 2456751 SHA256 ecd1a17b01d00768fef580274bb51fc7bbd2400460d5c0112850d068bd7be381 SHA512 f1a2e329c54f415605f6de1661dcea390789a10844cd36a26c56eab754cfddb0da3617f3552fb9b3a9d19f404870821a68a6f167630af08ebf1f7fac417cdee6 WHIRLPOOL 287a9db662b8a877369883aa110115cb0f2416da9404b3f2ca46a5fdebddbd67c1004b6490f1fb2894de2b22202aa396181a313ac12c7a2ef7a383a4145d204b
-DIST scons-2.3.4.tar.gz 621953 SHA256 4b57d72066fed3b6ff65a7dd9f73633c9b1c09f87520e9b3aae84b3e4864b441 SHA512 a7d6d5e175d119f6a247e69ddbd0a18c4f10752e20eaedb6bb1d67c6d5f0a79cdb9efdf2a573045f3dbc33519b8267951afff55f587c39639db1fe704cf5e0d2 WHIRLPOOL fe285a8a82f1360c1a1a1b6eda1bb001f88c2c723ddaeaab03d54a0b17d4571d96327be9fba6c92e9d98c48ca0bb88793c65625b79abe75a23d834058c84c410
DIST scons-2.3.5-user.html 1280097 SHA256 2724fe17e3901f6c70dc190e7a215a86e3c103f90393588480f0adb7c2c9a9bb SHA512 e2c80beacd03f4071e33f8084e499e54c8529e68ec02b972d0d0944b6e096437fd70f59339ebba652cc5539475e1b4eb8b80e4a3d188413ca5181af9ae5b70d3 WHIRLPOOL d73ef9a5f1cbf9a0cf70124b224a50b7d4ca5d7a35bddb6b88f3fa14ba5fbee1e2721ad9179698b5cd45f24bf91815bc15e4c0d40d21b34a761ec68243a1fc74
DIST scons-2.3.5-user.pdf 2505997 SHA256 4e157b75b49b6e15f339811102b8e3e8af761ed197a6fe0df01c535ecb16f758 SHA512 137ab2d3b1cab6821f2d8a8fde33406e2a7d46a4c26eec9de1073d3c03f49e1d485ae7884ed3cd2e41a0e3d2ef457e103d782dc1deb01a280c48e4f5e7e68f1e WHIRLPOOL f5394cc86930ec60259af01232948cd10aa7c240bf75262d622a94f0b2311bdc70835921b8ff7a5e2091adc035ce56ad1c0b69c22def1305082af3f6a3aaf802
DIST scons-2.3.5.tar.gz 631619 SHA256 8a8993e1914801ace5ce83c92bf4c43127669750e9dec8eb93574e57729e9c42 SHA512 aad0213d70c06b02d647a4de4a4fdcd9970e7bda6f3ba0b33e9ba05677af617302b3a557e7cb13560c9057c3b11fbc27cf5e8e7511297058ad9599a04c8381a3 WHIRLPOOL 545d759d0d3ecd54b706712030b5091f1c56f8a3762118c4fd2d27aae9a407e59bffa81ca3592369467a2561eeba867c2a3f91f4652ee34afd4514b06627fd7f
diff --git a/dev-util/scons/files/scons-1.2.0-popen.patch b/dev-util/scons/files/scons-1.2.0-popen.patch
deleted file mode 100644
index 23063cf..0000000
--- a/dev-util/scons/files/scons-1.2.0-popen.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- engine/SCons/compat/__init__.py (revision 2695)
-+++ engine/SCons/compat/__init__.py (working copy)
-@@ -167,11 +167,17 @@
- del shlex
- import_as('_scons_shlex', 'shlex')
-
--try:
-- import subprocess
--except ImportError:
-- # Pre-2.4 Python has no subprocess module.
-- import_as('_scons_subprocess', 'subprocess')
-+#try:
-+# import subprocess
-+#except ImportError:
-+# # Pre-2.4 Python has no subprocess module.
-+# import_as('_scons_subprocess', 'subprocess')
-+
-+# Import subprocess unconditionally to avoid possible race conditions in
-+# the official subprocess API. If there are API versions without known
-+# problems, we can version-check and use the original subprocess module
-+# in these cases.
-+import_as('_scons_subprocess', 'subprocess')
-
- import sys
- try:
-
-
---- engine/SCons/compat/_scons_subprocess.py (revision 2695)
-+++ engine/SCons/compat/_scons_subprocess.py (working copy)
-@@ -581,13 +581,19 @@
- class object:
- pass
-
-+import thread
-+lock = thread.allocate_lock()
-+
- class Popen(object):
- def __init__(self, args, bufsize=0, executable=None,
- stdin=None, stdout=None, stderr=None,
- preexec_fn=None, close_fds=False, shell=False,
- cwd=None, env=None, universal_newlines=False,
- startupinfo=None, creationflags=0):
-- """Create new Popen instance."""
-+ """Create new Popen instance.
-+ Popen is not thread-safe and is therefore protected with a lock.
-+ """
-+ lock.acquire()
- _cleanup()
-
- self._child_created = False
-@@ -655,6 +661,7 @@
- self.stderr = os.fdopen(errread, 'rU', bufsize)
- else:
- self.stderr = os.fdopen(errread, 'rb', bufsize)
-+ lock.release()
-
-
- def _translate_newlines(self, data):
diff --git a/dev-util/scons/files/scons-install-scripts.patch b/dev-util/scons/files/scons-install-scripts.patch
deleted file mode 100644
index 1e28ca7..0000000
--- a/dev-util/scons/files/scons-install-scripts.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/setup.py b/src/setup.py
---- a/src/setup.py
-+++ b/src/setup.py
-@@ -81,6 +81,7 @@
- import distutils.command.install_lib
- import distutils.command.install_scripts
- import distutils.command.build_scripts
-+from distutils.util import convert_path
-
- _install = distutils.command.install.install
- _install_data = distutils.command.install_data.install_data
-@@ -303,7 +304,7 @@
- else:
- create_version_script = self.do_nothing
-
-- inputs = self.get_inputs()
-+ inputs = [os.path.join(self.build_dir, os.path.basename(convert_path(script))) for script in self.get_inputs()]
- bat_scripts = [x for x in inputs if x[-4:] == '.bat']
- non_bat_scripts = [x for x in inputs if x[-4:] != '.bat']
-
diff --git a/dev-util/scons/scons-2.3.0.ebuild b/dev-util/scons/scons-2.3.0.ebuild
deleted file mode 100644
index 9ab42d3..0000000
--- a/dev-util/scons/scons-2.3.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
- http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-python_prepare_all() {
- local PATCHES=(
- "${FILESDIR}/scons-1.2.0-popen.patch"
- "${FILESDIR}/${PN}-2.1.0-jython.patch"
- )
-
- # https://bugs.gentoo.org/show_bug.cgi?id=361061
- sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
- # and make sure the build system doesn't "force" /usr/local/ :(
- sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_install() {
- distutils-r1_python_install \
- --standard-lib \
- --no-version-script \
- --install-data "${EPREFIX}"/usr/share
-}
-
-python_install_all() {
- local DOCS=( {CHANGES,README,RELEASE}.txt )
- distutils-r1_python_install_all
-
- use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
-
-src_install() {
- distutils-r1_src_install
-
- # Build system does not use build_scripts properly.
- # http://scons.tigris.org/issues/show_bug.cgi?id=2891
- python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
-}
diff --git a/dev-util/scons/scons-2.3.4.ebuild b/dev-util/scons/scons-2.3.4.ebuild
deleted file mode 100644
index c0a47a1..0000000
--- a/dev-util/scons/scons-2.3.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
- http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-PATCHES=( "${FILESDIR}/${PN}-2.1.0-jython.patch" )
-
-python_prepare_all() {
- # https://bugs.gentoo.org/show_bug.cgi?id=361061
- sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
- # and make sure the build system doesn't "force" /usr/local/ :(
- sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_install() {
- distutils-r1_python_install \
- --standard-lib \
- --no-version-script \
- --install-data "${EPREFIX}"/usr/share
-}
-
-python_install_all() {
- local DOCS=( {CHANGES,README,RELEASE}.txt )
- distutils-r1_python_install_all
-
- use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
-
-src_install() {
- distutils-r1_src_install
-
- # Build system does not use build_scripts properly.
- # http://scons.tigris.org/issues/show_bug.cgi?id=2891
- python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/scons/files/, dev-util/scons/
@ 2019-03-13 8:22 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2019-03-13 8:22 UTC (permalink / raw
To: gentoo-commits
commit: 164e59ca3d812446bb909bb34d1800e7b52b7312
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 13 07:52:44 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar 13 07:52:44 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=164e59ca
dev-util/scons: Drop old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-util/scons/Manifest | 8 --
.../files/scons-3.0.1-respect-cc-etc-r1.patch | 88 ----------------------
dev-util/scons/scons-3.0.1-r1.ebuild | 71 -----------------
dev-util/scons/scons-3.0.1-r100.ebuild | 73 ------------------
dev-util/scons/scons-3.0.1-r3.ebuild | 73 ------------------
dev-util/scons/scons-3.0.1.ebuild | 66 ----------------
dev-util/scons/scons-3.0.3.ebuild | 74 ------------------
7 files changed, 453 deletions(-)
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 6a0fef99ce7..23abad5f164 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,14 +1,6 @@
DIST scons-2.5.1-user.html 1112180 BLAKE2B 93df42b296d1be6ffcb73143c5ec9f46225e3e9d07154cf8f703d5f624d2996d85569ff302093a7a73dc0001cfeddf49ee9e57d9a1939d3c6b4689f8773e3ede SHA512 5be58a6bba4b92fc51f0b271fd7e08b820dda10775aaa40a012c0e54d485e02ebf6d0d0be379bd90980a9b496e86a951c8760a4a90107fb3b8f422e874e46046
DIST scons-2.5.1-user.pdf 2522755 BLAKE2B 0dbf4ec98cd1dfb4889595762fdf57c2988a6784d75f8c3ac53e79d686b745ae4dd7b674ce34d61255c798e203fb6de93eaaf936a4842b27990350fa73b6bd46 SHA512 0bd7f67a1355ec33125bef87ce1bc352bda5b0befd9809673a427851c843191d74930b4ca9add705152393521f81d926595d173b0101013da216217dc5b64397
DIST scons-2.5.1.tar.gz 620909 BLAKE2B 021e02583dab06a859e46d164be79dcaa49a1a383c5d3fb9baa64afabb793e049b7ebefff1bbbcc8be1f364ca5c64e1a9c7ef937c32407853e39f4d84a91e51d SHA512 0e39f7f22a6c4ecc13edcd843b050754da5ded5371b3a8b406395f7b53dd280f95f804707eec271f8de3624d06f5b4ba3cc788dc4eb891cad224a163544f51b9
-DIST scons-3.0.1-user.html 1121915 BLAKE2B 0ee57d112ba6269a488335e9354723c645e4b06129c26ca64d45923066ad92cf5519fa4933ef74dd5254d5b068b2909290c5c930a4247ebd6a5f1761f683a6e2 SHA512 e49ae91b04509d32f67d17cabb6619ede49c7190d80efcbd1e0bd1992574ea08c7abc892cad26f8b995b0f43bccd099a96ce633d63d6f56aafc442f9aa734aec
-DIST scons-3.0.1-user.pdf 2541376 BLAKE2B 43895501bf8b4a7eda12c5b3b076e6a71e949727224c279ef77671f7d4094245d37b9d8aeca6daa7d043c5513cc0c83e82a06f8a50bb4add4f0d750fce416bac SHA512 9fab1915c96cd32908cbbf123dfb8c97be99ec45df0461fa68ac47706f6bfc51d7ab970a43630e5414b01a8b9d27409e356b57c134478cec13f1bcbd97f615e7
-DIST scons-3.0.1.gh.tar.gz 5481813 BLAKE2B 750668bf034ff48f635db0395fc4fc950a7148c315099738da4d96f346d025b7dd3849e376d566e5f55793ee0b901ad8a4d7ff661068420f085ab76404ca244c SHA512 092a5d88191e4c9deee2e14371745fad1c3beee746f55256729444ad56a141a28f45ebeef4b2a7ec37344048ff16864d85b978855c0285a14b7c6f46f91158ac
-DIST scons-3.0.1.tar.gz 634815 BLAKE2B f5bacec048969d592697bc3dfb44678c25a92982f7ba81f9951e73532e8b9ac0906fe72c979d7818db5ab9b2c6dd380df21d323e47ea4cc0db646d6eed4b7d94 SHA512 b7be40ba507366cc678f31b910553cadaf59781c3a91833a34acbd29d9cad0cda38f6753034bf92c3af55d1e0c2f72aba5d81f1ec67205d0345b005d286f7084
-DIST scons-3.0.3-user.html 1131439 BLAKE2B d1755cd462f7e6aad51c6289bd3137c0ae67fd145f3c6fe19a19ad49c793351f9dffaaef7a42f42922f2535aa384f0ce9c23a18070f3a22897a210ac44cdb1af SHA512 48dae93d14928bea3ac17731f7e379a1a907059d75fd7979af02c1442b80cba0bd2c93e3fde4e5220261b3e4afd70f323ecef991dc0ec7b9694e08b11048b932
-DIST scons-3.0.3-user.pdf 2545890 BLAKE2B c68c173e62c4a42e01d87f749556ebe1ce4b6f2c3e96e8b87825aefac30b59ad9642977c35441172e1453ffbee1812a383d7bfc24112e4562f5f24a1defc6ae2 SHA512 75da4a0870c9ef860ad1789f9a229b94affe35efd228c450d842a88090279dcfd9ae93b05df366a3d43da27c2e44ee36ae702013b9d4fe2e78db895a7892f182
-DIST scons-3.0.3.gh.tar.gz 5497106 BLAKE2B 5bf6b2eaf59200b8eeb19eeb9f4ceda6b9b6bf32561f220565617dc08c9094687ec5200eeb2e182f89d01647d5d6638d0ac742a4bd297cb4f781578707f63a83 SHA512 594c1c4c48a3c48418e2b3945fe17af96ff29d435704e8b6cbb85406cd38109d0b865cb2f7bbbc733f69ea5e0f283f4b5942a0140dac263725968e62d0c87a2e
-DIST scons-3.0.3.tar.gz 651374 BLAKE2B e095affdcdf75203559f6e1c9a94ec4ab29c5d8e84354d1ed04bd4b64f7cb14ca1916ed576eb0d180c4e871878b98072e923dd84ce5b8e61ce7fb5ab3747773b SHA512 a9f52bca2f5d98f9ec3aa6ce0fd05660d573e6738daef2162306c95f19bd95851bd83f44cab4a81187c051491b0f016137e443f70d764149bb00ad03f46f273e
DIST scons-3.0.4-user.html 1127751 BLAKE2B 5bafa81d075c063cc8c0c4d147fdf7573834e7b0af9099b7b68d7cf3c8872061b7ecc93e7119723eaa9d393e4463744a9e9bd8074ce28d8b518d366a11e4a215 SHA512 f3bc5591b90fb05420b00a110d32921394b867255b3925fab97420b864579702a956237983fb5b0a25d2f6d0268493b0f1819fbcb6f1027cc10ad7b59e2836a3
DIST scons-3.0.4-user.pdf 2561758 BLAKE2B aefd100912345f399e52d805bc2f01846f0bcdfb31524212e69fb41713c193a233a30dcea9133e35001a145ce62b84c648b6d57856c0d5dfa019974546cb4d82 SHA512 03b9e1e8b60ca07986956f1e5c63d56573222ea303bed1976167239b4e9ad73056776a80c7fe2529987aa90856c35bc1c858d1a445f34e7964b675e700845e71
DIST scons-3.0.4.gh.tar.gz 5500498 BLAKE2B 2157141d70f0f6d80606a0d53e0b6b99f72ac6d5f8b63e8825c1f484eb5c92979b50e897d2aadc2b201ee6f06a0d1df00ab272b96cc303c34f75124123f40a90 SHA512 d57924f0e7713ec2e5d7159fbf0078947aa5ce49f7cdf7a4ea47c19efbce7ec335a5e5448e200240be1095655c5c25f1466285f0bed5bdadeb2673845b23c4f5
diff --git a/dev-util/scons/files/scons-3.0.1-respect-cc-etc-r1.patch b/dev-util/scons/files/scons-3.0.1-respect-cc-etc-r1.patch
deleted file mode 100644
index 748646b14f1..00000000000
--- a/dev-util/scons/files/scons-3.0.1-respect-cc-etc-r1.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 68fc19b7fd6b65ab850e4fd8ef5e85c672989f92 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 10 May 2018 08:01:08 +0200
-Subject: [PATCH] posix: Also force common toolchain vars for Gentoo
-
----
- src/engine/SCons/Platform/posix.py | 20 ++++++++++++++++++++
- src/engine/SCons/Tool/cc.py | 3 ++-
- src/engine/SCons/Tool/cxx.py | 3 ++-
- src/engine/SCons/Tool/link.py | 3 ++-
- 4 files changed, 26 insertions(+), 3 deletions(-)
-
-diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py
-index af34650c..5533c87c 100644
---- a/src/engine/SCons/Platform/posix.py
-+++ b/src/engine/SCons/Platform/posix.py
-@@ -93,6 +93,26 @@ def generate(env):
- if 'ENV' in env:
- new_env.update(env['ENV'])
- env['ENV'] = new_env
-+
-+ # Furthermore, force common compiler/linker variables as well
-+ envvar_mapping = {
-+ 'AR': 'AR',
-+ 'AS': 'AS',
-+ 'ASFLAGS': 'ASFLAGS',
-+ 'CC': 'CC',
-+ 'CXX': 'CXX',
-+ 'CFLAGS': 'CFLAGS',
-+ 'CXXFLAGS': 'CXXFLAGS',
-+ 'CPPFLAGS': 'CPPFLAGS',
-+ 'LDFLAGS': 'LINKFLAGS',
-+ }
-+
-+ for envvar, toolvar in envvar_mapping.items():
-+ if toolvar not in env and envvar in env['ENV']:
-+ val = env['ENV'][envvar]
-+ if toolvar.endswith('FLAGS'):
-+ val = SCons.Util.CLVar(val)
-+ env[toolvar] = val
- else:
- if 'ENV' not in env:
- env['ENV'] = {}
-diff --git a/src/engine/SCons/Tool/cc.py b/src/engine/SCons/Tool/cc.py
-index 590ec5fd..5f9229a0 100644
---- a/src/engine/SCons/Tool/cc.py
-+++ b/src/engine/SCons/Tool/cc.py
-@@ -80,7 +80,8 @@ def generate(env):
-
- if 'CC' not in env:
- env['CC'] = env.Detect(compilers) or compilers[0]
-- env['CFLAGS'] = SCons.Util.CLVar('')
-+ if 'CFLAGS' not in env:
-+ env['CFLAGS'] = SCons.Util.CLVar('')
- env['CCCOM'] = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
- env['SHCC'] = '$CC'
- env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS')
-diff --git a/src/engine/SCons/Tool/cxx.py b/src/engine/SCons/Tool/cxx.py
-index 430851c8..ca5ab563 100644
---- a/src/engine/SCons/Tool/cxx.py
-+++ b/src/engine/SCons/Tool/cxx.py
-@@ -74,7 +74,8 @@ def generate(env):
-
- if 'CXX' not in env:
- env['CXX'] = env.Detect(compilers) or compilers[0]
-- env['CXXFLAGS'] = SCons.Util.CLVar('')
-+ if 'CXXFLAGS' not in env:
-+ env['CXXFLAGS'] = SCons.Util.CLVar('')
- env['CXXCOM'] = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
- env['SHCXX'] = '$CXX'
- env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
-diff --git a/src/engine/SCons/Tool/link.py b/src/engine/SCons/Tool/link.py
-index 07e92507..614d1779 100644
---- a/src/engine/SCons/Tool/link.py
-+++ b/src/engine/SCons/Tool/link.py
-@@ -292,7 +292,8 @@ def generate(env):
- env.Append(SHLIBEMITTER = [shlib_emitter])
- env['SMARTLINK'] = smart_link
- env['LINK'] = "$SMARTLINK"
-- env['LINKFLAGS'] = SCons.Util.CLVar('')
-+ if 'LINKFLAGS' not in env:
-+ env['LINKFLAGS'] = SCons.Util.CLVar('')
- # __RPATH is only set to something ($_RPATH typically) on platforms that support it.
- env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
- env['LIBDIRPREFIX']='-L'
---
-2.17.0
-
diff --git a/dev-util/scons/scons-3.0.1-r1.ebuild b/dev-util/scons/scons-3.0.1-r1.ebuild
deleted file mode 100644
index 777e651c9df..00000000000
--- a/dev-util/scons/scons-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- doc? (
- http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
- http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
- )
- test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
- # support env passthrough for Gentoo ebuilds
- "${FILESDIR}"/scons-3.0.1-env-passthrough.patch
-)
-
-src_unpack() {
- # use the git directory structure, but put pregenerated release
- # inside src/ subdirectory to make our life easier
- if use test; then
- unpack "${P}.gh.tar.gz"
- rm -r "${P}/src" || die
- else
- mkdir "${P}" || die
- fi
-
- cd "${P}" || die
- unpack "${P}.tar.gz"
- mv "${P}" src || die
-}
-
-src_prepare() {
- # apply patches relatively to top directory
- cd "${WORKDIR}/${P}" || die
- distutils-r1_src_prepare
-
- # remove half-broken, useless custom commands
- # and fix manpage install location
- sed -i -e '/cmdclass/,/}$/d' \
- -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-}
-
-python_test() {
- cd "${WORKDIR}/${P}" || die
- "${EPYTHON}" runtest.py -as \
- -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
- --builddir "${BUILD_DIR}/lib" ||
- die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- local DOCS=( {CHANGES,README,RELEASE}.txt )
- distutils-r1_python_install_all
- rm "${ED%/}/usr/bin/scons.bat" || die
-
- use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-3.0.1-r100.ebuild b/dev-util/scons/scons-3.0.1-r100.ebuild
deleted file mode 100644
index 0eedf0cbe6d..00000000000
--- a/dev-util/scons/scons-3.0.1-r100.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- doc? (
- http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
- http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
- )
- test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
- # support env passthrough for Gentoo ebuilds
- "${FILESDIR}"/scons-3.0.1-env-passthrough.patch
- # respect CC, CXX, C*FLAGS, LDFLAGS by default
- "${FILESDIR}"/scons-3.0.1-respect-cc-etc-r1.patch
-)
-
-src_unpack() {
- # use the git directory structure, but put pregenerated release
- # inside src/ subdirectory to make our life easier
- if use test; then
- unpack "${P}.gh.tar.gz"
- rm -r "${P}/src" || die
- else
- mkdir "${P}" || die
- fi
-
- cd "${P}" || die
- unpack "${P}.tar.gz"
- mv "${P}" src || die
-}
-
-src_prepare() {
- # apply patches relatively to top directory
- cd "${WORKDIR}/${P}" || die
- distutils-r1_src_prepare
-
- # remove half-broken, useless custom commands
- # and fix manpage install location
- sed -i -e '/cmdclass/,/}$/d' \
- -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-}
-
-python_test() {
- cd "${WORKDIR}/${P}" || die
- "${EPYTHON}" runtest.py -as \
- -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
- --builddir "${BUILD_DIR}/lib" ||
- die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- local DOCS=( {CHANGES,README,RELEASE}.txt )
- distutils-r1_python_install_all
- rm "${ED%/}/usr/bin/scons.bat" || die
-
- use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-3.0.1-r3.ebuild b/dev-util/scons/scons-3.0.1-r3.ebuild
deleted file mode 100644
index 286ff3abba4..00000000000
--- a/dev-util/scons/scons-3.0.1-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- doc? (
- http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
- http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
- )
- test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
- # support env passthrough for Gentoo ebuilds
- "${FILESDIR}"/scons-3.0.1-env-passthrough.patch
- # respect CC, CXX, C*FLAGS, LDFLAGS by default
- "${FILESDIR}"/scons-3.0.1-respect-cc-etc-r1.patch
-)
-
-src_unpack() {
- # use the git directory structure, but put pregenerated release
- # inside src/ subdirectory to make our life easier
- if use test; then
- unpack "${P}.gh.tar.gz"
- rm -r "${P}/src" || die
- else
- mkdir "${P}" || die
- fi
-
- cd "${P}" || die
- unpack "${P}.tar.gz"
- mv "${P}" src || die
-}
-
-src_prepare() {
- # apply patches relatively to top directory
- cd "${WORKDIR}/${P}" || die
- distutils-r1_src_prepare
-
- # remove half-broken, useless custom commands
- # and fix manpage install location
- sed -i -e '/cmdclass/,/}$/d' \
- -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-}
-
-python_test() {
- cd "${WORKDIR}/${P}" || die
- "${EPYTHON}" runtest.py -as \
- -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
- --builddir "${BUILD_DIR}/lib" ||
- die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- local DOCS=( {CHANGES,README,RELEASE}.txt )
- distutils-r1_python_install_all
- rm "${ED%/}/usr/bin/scons.bat" || die
-
- use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-3.0.1.ebuild b/dev-util/scons/scons-3.0.1.ebuild
deleted file mode 100644
index 1a6f2c59360..00000000000
--- a/dev-util/scons/scons-3.0.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- doc? (
- http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
- http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
- )
- test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc test"
-
-S=${WORKDIR}/${P}/src
-
-src_unpack() {
- # use the git directory structure, but put pregenerated release
- # inside src/ subdirectory to make our life easier
- if use test; then
- unpack "${P}.gh.tar.gz"
- rm -r "${P}/src" || die
- else
- mkdir "${P}" || die
- fi
-
- cd "${P}" || die
- unpack "${P}.tar.gz"
- mv "${P}" src || die
-}
-
-src_prepare() {
- # apply patches relatively to top directory
- cd "${WORKDIR}/${P}" || die
- distutils-r1_src_prepare
-
- # remove half-broken, useless custom commands
- # and fix manpage install location
- sed -i -e '/cmdclass/,/}$/d' \
- -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-}
-
-python_test() {
- cd "${WORKDIR}/${P}" || die
- "${EPYTHON}" runtest.py -as \
- -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
- --builddir "${BUILD_DIR}/lib" ||
- die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- local DOCS=( {CHANGES,README,RELEASE}.txt )
- distutils-r1_python_install_all
- rm "${ED%/}/usr/bin/scons.bat" || die
-
- use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-3.0.3.ebuild b/dev-util/scons/scons-3.0.3.ebuild
deleted file mode 100644
index 7ba0a5a8dbf..00000000000
--- a/dev-util/scons/scons-3.0.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- doc? (
- http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
- http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
- )
- test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
- # support env passthrough for Gentoo ebuilds
- "${FILESDIR}"/scons-3.0.1-env-passthrough.patch
- # respect CC, CXX, C*FLAGS, LDFLAGS by default
- "${FILESDIR}"/scons-3.0.3-respect-cc-etc-r1.patch
-)
-
-src_unpack() {
- # use the git directory structure, but put pregenerated release
- # inside src/ subdirectory to make our life easier
- if use test; then
- unpack "${P}.gh.tar.gz"
- rm -r "${P}/src" || die
- else
- mkdir "${P}" || die
- fi
-
- cd "${P}" || die
- unpack "${P}.tar.gz"
- mv "${P}" src || die
-}
-
-src_prepare() {
- # apply patches relatively to top directory
- cd "${WORKDIR}/${P}" || die
- distutils-r1_src_prepare
-
- # remove half-broken, useless custom commands
- # and fix manpage install location
- sed -i -e '/cmdclass/,/},$/d' \
- -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-}
-
-python_test() {
- cd "${WORKDIR}/${P}" || die
- "${EPYTHON}" runtest.py -as \
- -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
- --builddir "${BUILD_DIR}/lib" ||
- die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- local DOCS=( {CHANGES,README,RELEASE}.txt )
- distutils-r1_python_install_all
- rm "${ED%/}/usr/bin/scons.bat" || die
-
- use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/scons/files/, dev-util/scons/
@ 2021-01-21 10:20 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2021-01-21 10:20 UTC (permalink / raw
To: gentoo-commits
commit: d43592155db5c85047c85b92a46638bf0684ae3e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 10:06:58 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 10:20:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4359215
dev-util/scons: Fix missing os import in Gentoo patch
Closes: https://bugs.gentoo.org/766330
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-util/scons/files/scons-4.1.0-env-passthrough.patch | 15 ++++++++-------
.../scons/{scons-4.1.0.ebuild => scons-4.1.0-r1.ebuild} | 0
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/dev-util/scons/files/scons-4.1.0-env-passthrough.patch b/dev-util/scons/files/scons-4.1.0-env-passthrough.patch
index 75172042e56..06ec2f21761 100644
--- a/dev-util/scons/files/scons-4.1.0-env-passthrough.patch
+++ b/dev-util/scons/files/scons-4.1.0-env-passthrough.patch
@@ -1,20 +1,20 @@
-From dd6021a9853f009e2f45f36b9aa80c5a78bc90ac Mon Sep 17 00:00:00 2001
+From fb07dc4b4fa178b0c424c5f400b18669abd8960e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Wed, 9 May 2018 17:04:49 +0200
-Subject: [PATCH 1/2] posix: Support GENTOO_SCONS_ENV_PASSTHROUGH=1
+Subject: [PATCH] posix: Support GENTOO_SCONS_ENV_PASSTHROUGH=1
Support GENTOO_SCONS_ENV_PASSTHROUGH=1 variable to override the default
of wiping the environment and resetting PATH to default, and instead
pass all variables through.
---
- SCons/Platform/posix.py | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
+ SCons/Platform/posix.py | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
-diff --git a/src/SCons/Platform/posix.py b/src/SCons/Platform/posix.py
-index 4c9f8f9ba..37786229f 100644
+diff --git a/SCons/Platform/posix.py b/SCons/Platform/posix.py
+index 4c9f8f9ba..fbc81196d 100644
--- a/src/SCons/Platform/posix.py
+++ b/src/SCons/Platform/posix.py
-@@ -82,9 +82,17 @@ def generate(env):
+@@ -82,9 +82,18 @@ def generate(env):
pspawn = piped_env_spawn
# Note that this means that 'escape' is no longer used
@@ -22,6 +22,7 @@ index 4c9f8f9ba..37786229f 100644
- env['ENV'] = {}
- env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin:/snap/bin'
+ # Force pass-through of environment variables in Gentoo builds
++ import os
+ if os.environ.get('GENTOO_SCONS_ENV_PASSTHROUGH', False):
+ new_env = os.environ.copy()
+ if 'ENV' in env:
diff --git a/dev-util/scons/scons-4.1.0.ebuild b/dev-util/scons/scons-4.1.0-r1.ebuild
similarity index 100%
rename from dev-util/scons/scons-4.1.0.ebuild
rename to dev-util/scons/scons-4.1.0-r1.ebuild
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/scons/files/, dev-util/scons/
@ 2021-03-28 11:59 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2021-03-28 11:59 UTC (permalink / raw
To: gentoo-commits
commit: 1bf084fef282cf65c6a0167d8995f9c1399f1f3a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 28 11:57:51 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Mar 28 11:57:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bf084fe
dev-util/scons: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-util/scons/Manifest | 4 -
.../scons/files/scons-4.0.0-env-passthrough.patch | 40 ---------
dev-util/scons/scons-4.0.1.ebuild | 100 ---------------------
3 files changed, 144 deletions(-)
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 5ab364d5356..669ad9a3289 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,7 +1,3 @@
-DIST scons-4.0.1-user.html 1415152 BLAKE2B 1a94b2ef5e076d883f2960825f055c7cc39cfd1848be797a9519bf94834cd4174d3da3274ef77f64106c1cc182c3f8cef363e3982f5c227d3a6dcbeadbc847c2 SHA512 f1165836ad80c90caa4d936ffc86c0ed20ea4c5e7854c36fee3a2c575b1c05c731d4ece9554e43292e6da30176ad9f31f31cf12f84264307c1494f79b06f43c7
-DIST scons-4.0.1-user.pdf 2468804 BLAKE2B f0af6bc6b41d972b98e955ee3ccec908aa366eabe31bd01022abe1f6d3a94dd6d7da26f71de23a6dfbcbc7bb4e439463f69bb7e8a5780c1300e3ba508b9eb314 SHA512 0d2733e2f1391083522a64117bfd35a2160d1366382f6f630b26eba36fc12ce797467d5e16efeb3b7f58aa9d853f96ae0d50fe78f59e78d24642b146bc7e565d
-DIST scons-4.0.1.gh.tar.gz 5578800 BLAKE2B f9ece5eaf1b133219f975e484beb5df726560a38969b8e8ad829781b960b438458bfcd7971333da87560c957675b2a4f8675e757fb0a4268cc4ecf72bb60d45f SHA512 f23c5dfd3c236e9f9f85b986ca64a36dbd85e9f3383cb3577e082a7dea4b83283020fbf064c2d919ab116195c6708fc11f906fcf3b0bc0533a4bc49a4f7371c6
-DIST scons-4.0.1.tar.gz 2874481 BLAKE2B 98377e62ae31d32758a93c4e04c578b88ea541cc292af63c6ca43e2948745e416ee6d757d98129ee30d0e0bbab90664889441a5bb86d4c9dfc649ca1dbef7536 SHA512 400b11323d48f04395b519dfafb6fce15a6dea92013f599dc4895b112629c0a06c7d2806755c74047d001d60087b94f39a118f512b7ee8de6214a4ffc7310468
DIST scons-4.1.0-user.html 1454432 BLAKE2B 9fac4d7bfb4b25708bc4cc48d952beb030f88181af5dfee63090f726b1a82443c192c63ec5939869967ef8f374e8599321212971439fb265fb050b263681c9f8 SHA512 74f1349fa61dac9e66cfb863cb3126d07ce5f421b3e87d0220eb32bd5017ba8f6cf96eb8cb5ee45c39022671aa9f2d0408d4039970c438a69c002445aea510be
DIST scons-4.1.0-user.pdf 2691364 BLAKE2B a910a09fa936d4d6f8dc967676d5aa009aac58a5a4566399b3ddc3512ac0259731e6c5399722fefadb3b79d8f89a5257e2e9bc2fa4d65697c8293ab995248d64 SHA512 64584731a59b59b78283be3876ecca91d742f83da2653d0de17922bec01e3c9cea1ce2ce3c8dc718597910ba86ed2c8aff0f7ae371bf763439b57a6d5484e1a7
DIST scons-4.1.0.gh.tar.gz 5609204 BLAKE2B ede3d47a1ec652b9248681e26738073e9d01daab7ffeccc58f0fcadb79661e30edb9a35a511518e4a58459243acb027afd8fa5849b0f9e4bae451055f7b1a062 SHA512 f79b86bb09783767b3872cfb8efb665372714a604af2aaf3adc66eee63d3afe27bc6b2aab83813743c83f71c81c800d42842e916501787ba402ce2726dda9b44
diff --git a/dev-util/scons/files/scons-4.0.0-env-passthrough.patch b/dev-util/scons/files/scons-4.0.0-env-passthrough.patch
deleted file mode 100644
index 23538395e97..00000000000
--- a/dev-util/scons/files/scons-4.0.0-env-passthrough.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From f2f8536be12f1d095382e7598060c1eb51eb5337 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 9 May 2018 17:04:49 +0200
-Subject: [PATCH] posix: Support GENTOO_SCONS_ENV_PASSTHROUGH=1
-
-Support GENTOO_SCONS_ENV_PASSTHROUGH=1 variable to override the default
-of wiping the environment and resetting PATH to default, and instead
-pass all variables through.
----
- src/SCons/Platform/posix.py | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/SCons/Platform/posix.py b/src/SCons/Platform/posix.py
-index 8db08db1..af34650c 100644
---- a/src/SCons/Platform/posix.py
-+++ b/src/SCons/Platform/posix.py
-@@ -87,9 +87,17 @@ def generate(env):
- pspawn = piped_env_spawn
- # Note that this means that 'escape' is no longer used
-
-- if 'ENV' not in env:
-- env['ENV'] = {}
-- env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin'
-+ # Force pass-through of environment variables in Gentoo builds
-+ if os.environ.get('GENTOO_SCONS_ENV_PASSTHROUGH', False):
-+ new_env = os.environ.copy()
-+ if 'ENV' in env:
-+ new_env.update(env['ENV'])
-+ env['ENV'] = new_env
-+ else:
-+ if 'ENV' not in env:
-+ env['ENV'] = {}
-+ env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin'
-+
- env['OBJPREFIX'] = ''
- env['OBJSUFFIX'] = '.o'
- env['SHOBJPREFIX'] = '$OBJPREFIX'
---
-2.17.0
-
diff --git a/dev-util/scons/scons-4.0.1.ebuild b/dev-util/scons/scons-4.0.1.ebuild
deleted file mode 100644
index ccba5ef0e0e..00000000000
--- a/dev-util/scons/scons-4.0.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="https://www.scons.org/"
-SRC_URI="
- https://downloads.sourceforge.net/project/scons/scons/${PV}/${P}.tar.gz
- doc? (
- https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
- https://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
- )
- test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 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 )"
-
-DEPEND="
- test? (
- dev-libs/libxml2[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- )
-"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
- # support env passthrough for Gentoo ebuilds
- "${FILESDIR}"/scons-4.0.0-env-passthrough.patch
- # respect CC, CXX, C*FLAGS, LDFLAGS by default
- "${FILESDIR}"/scons-4.0.0-respect-cc-etc-r1.patch
-)
-
-src_unpack() {
- # use the git directory structure, but put pregenerated release
- # inside src/ subdirectory to make our life easier
- if use test; then
- unpack "${P}.gh.tar.gz"
- else
- mkdir -p "${P}"/src || die
- fi
-
- tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
-}
-
-src_prepare() {
- # apply patches relatively to top directory
- cd "${WORKDIR}/${P}" || die
- distutils-r1_src_prepare
-
- # remove half-broken, useless custom commands
- # and fix manpage install location
- sed -i -e '/cmdclass/,/},$/d' \
- -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-
- if use test; then
- local remove_tests=(
- # TODO: does not respect PATH?
- test/Clang
- # broken
- test/DVIPDF/DVIPDFFLAGS.py
- test/Java/swig-dependencies.py
- test/Java/multi-step.py
- )
- rm -r "${remove_tests[@]}" || die
- fi
-}
-
-python_test() {
- local -x COLUMNS=80
- # set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
- local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
- # unset some env variables to pass appropriate tests
- unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
- cd "${WORKDIR}/${P}" || die
- "${EPYTHON}" runtest.py -a --passed \
- -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
- --builddir "${BUILD_DIR}/lib"
-
- # runtest.py script returns "0" if all tests are passed
- # and returns "2" if there are any tests with "no result"
- # (i.e. in case if some tools are not installed or it's Windows specific tests)
- [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/scons/files/, dev-util/scons/
@ 2021-08-01 17:41 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2021-08-01 17:41 UTC (permalink / raw
To: gentoo-commits
commit: 2705c315b275862ed6f1c6a1976e6a42178ce957
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 1 17:38:20 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 1 17:41:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2705c315
dev-util/scons: Fix Gentoo patch
Closes: https://bugs.gentoo.org/806043
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../scons/files/scons-4.2.0-respect-cc-etc.patch | 96 ++++++++++++++++++++++
.../{scons-4.2.0.ebuild => scons-4.2.0-r1.ebuild} | 2 +-
2 files changed, 97 insertions(+), 1 deletion(-)
diff --git a/dev-util/scons/files/scons-4.2.0-respect-cc-etc.patch b/dev-util/scons/files/scons-4.2.0-respect-cc-etc.patch
new file mode 100644
index 00000000000..a075fec91d2
--- /dev/null
+++ b/dev-util/scons/files/scons-4.2.0-respect-cc-etc.patch
@@ -0,0 +1,96 @@
+From b6ba1f2b1feda529eca20fb8980f7c6c52397df6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 10 May 2018 08:01:08 +0200
+Subject: [PATCH] posix: Also force common toolchain vars for Gentoo
+
+---
+ SCons/Platform/posix.py | 21 +++++++++++++++++++++
+ SCons/Tool/cc.py | 3 ++-
+ SCons/Tool/cxx.py | 3 ++-
+ SCons/Tool/link.py | 3 ++-
+ 4 files changed, 27 insertions(+), 3 deletions(-)
+
+diff --git a/src/SCons/Platform/posix.py b/src/SCons/Platform/posix.py
+index 37cd2377f..1246781de 100644
+--- a/src/SCons/Platform/posix.py
++++ b/src/SCons/Platform/posix.py
+@@ -33,6 +33,7 @@ import subprocess
+ from SCons.Platform import TempFileMunge
+ from SCons.Platform.virtualenv import ImportVirtualenv
+ from SCons.Platform.virtualenv import ignore_virtualenv, enable_virtualenv
++import SCons.Util
+
+ exitvalmap = {
+ 2 : 127,
+@@ -86,6 +87,26 @@ def generate(env):
+ if 'ENV' in env:
+ new_env.update(env['ENV'])
+ env['ENV'] = new_env
++
++ # Furthermore, force common compiler/linker variables as well
++ envvar_mapping = {
++ 'AR': 'AR',
++ 'AS': 'AS',
++ 'ASFLAGS': 'ASFLAGS',
++ 'CC': 'CC',
++ 'CXX': 'CXX',
++ 'CFLAGS': 'CFLAGS',
++ 'CXXFLAGS': 'CXXFLAGS',
++ 'CPPFLAGS': 'CPPFLAGS',
++ 'LDFLAGS': 'LINKFLAGS',
++ }
++
++ for envvar, toolvar in envvar_mapping.items():
++ if toolvar not in env and envvar in env['ENV']:
++ val = env['ENV'][envvar]
++ if toolvar.endswith('FLAGS'):
++ val = SCons.Util.CLVar(val)
++ env[toolvar] = val
+ else:
+ if 'ENV' not in env:
+ env['ENV'] = {}
+diff --git a/src/SCons/Tool/cc.py b/src/SCons/Tool/cc.py
+index 590ec5fd3..5f9229a02 100644
+--- a/src/SCons/Tool/cc.py
++++ b/src/SCons/Tool/cc.py
+@@ -80,7 +80,8 @@ def generate(env):
+
+ if 'CC' not in env:
+ env['CC'] = env.Detect(compilers) or compilers[0]
+- env['CFLAGS'] = SCons.Util.CLVar('')
++ if 'CFLAGS' not in env:
++ env['CFLAGS'] = SCons.Util.CLVar('')
+ env['CCCOM'] = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
+ env['SHCC'] = '$CC'
+ env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS')
+diff --git a/src/SCons/Tool/cxx.py b/src/SCons/Tool/cxx.py
+index 128cdc4f6..1f852b64c 100644
+--- a/src/SCons/Tool/cxx.py
++++ b/src/SCons/Tool/cxx.py
+@@ -69,7 +69,8 @@ def generate(env):
+
+ if 'CXX' not in env:
+ env['CXX'] = env.Detect(compilers) or compilers[0]
+- env['CXXFLAGS'] = SCons.Util.CLVar('')
++ if 'CXXFLAGS' not in env:
++ env['CXXFLAGS'] = SCons.Util.CLVar('')
+ env['CXXCOM'] = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
+ env['SHCXX'] = '$CXX'
+ env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
+diff --git a/src/SCons/Tool/link.py b/src/SCons/Tool/link.py
+index 24d17a31f..4ea9917e8 100644
+--- a/src/SCons/Tool/link.py
++++ b/src/SCons/Tool/link.py
+@@ -49,7 +49,8 @@ def generate(env):
+
+ env['SMARTLINK'] = smart_link
+ env['LINK'] = "$SMARTLINK"
+- env['LINKFLAGS'] = SCons.Util.CLVar('')
++ if 'LINKFLAGS' not in env:
++ env['LINKFLAGS'] = SCons.Util.CLVar('')
+
+ # __RPATH is only set to something ($_RPATH typically) on platforms that support it.
+ env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
+--
+2.32.0
+
diff --git a/dev-util/scons/scons-4.2.0.ebuild b/dev-util/scons/scons-4.2.0-r1.ebuild
similarity index 98%
rename from dev-util/scons/scons-4.2.0.ebuild
rename to dev-util/scons/scons-4.2.0-r1.ebuild
index ab10b165363..9c816bfcc0b 100644
--- a/dev-util/scons/scons-4.2.0.ebuild
+++ b/dev-util/scons/scons-4.2.0-r1.ebuild
@@ -38,7 +38,7 @@ PATCHES=(
# support env passthrough for Gentoo ebuilds
"${FILESDIR}"/scons-4.1.0-env-passthrough.patch
# respect CC, CXX, C*FLAGS, LDFLAGS by default
- "${FILESDIR}"/scons-4.0.0-respect-cc-etc-r1.patch
+ "${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch
)
src_unpack() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/scons/files/, dev-util/scons/
@ 2021-10-13 9:05 Michał Górny
0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2021-10-13 9:05 UTC (permalink / raw
To: gentoo-commits
commit: cfaacfcffc6895ebe3d021acedf2d71de76f7dc8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 13 09:04:50 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct 13 09:04:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfaacfcf
dev-util/scons: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-util/scons/Manifest | 4 -
.../files/scons-4.0.0-respect-cc-etc-r1.patch | 88 -------------------
dev-util/scons/scons-4.1.0-r1.ebuild | 98 ----------------------
3 files changed, 190 deletions(-)
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index b7a44b31276..1a3cad8d5ab 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,7 +1,3 @@
-DIST scons-4.1.0-user.html 1454432 BLAKE2B 9fac4d7bfb4b25708bc4cc48d952beb030f88181af5dfee63090f726b1a82443c192c63ec5939869967ef8f374e8599321212971439fb265fb050b263681c9f8 SHA512 74f1349fa61dac9e66cfb863cb3126d07ce5f421b3e87d0220eb32bd5017ba8f6cf96eb8cb5ee45c39022671aa9f2d0408d4039970c438a69c002445aea510be
-DIST scons-4.1.0-user.pdf 2691364 BLAKE2B a910a09fa936d4d6f8dc967676d5aa009aac58a5a4566399b3ddc3512ac0259731e6c5399722fefadb3b79d8f89a5257e2e9bc2fa4d65697c8293ab995248d64 SHA512 64584731a59b59b78283be3876ecca91d742f83da2653d0de17922bec01e3c9cea1ce2ce3c8dc718597910ba86ed2c8aff0f7ae371bf763439b57a6d5484e1a7
-DIST scons-4.1.0.gh.tar.gz 5609204 BLAKE2B ede3d47a1ec652b9248681e26738073e9d01daab7ffeccc58f0fcadb79661e30edb9a35a511518e4a58459243acb027afd8fa5849b0f9e4bae451055f7b1a062 SHA512 f79b86bb09783767b3872cfb8efb665372714a604af2aaf3adc66eee63d3afe27bc6b2aab83813743c83f71c81c800d42842e916501787ba402ce2726dda9b44
-DIST scons-4.1.0.tar.gz 3007701 BLAKE2B 70ab64ecfd89fa2af1d78a33fcef82a5f7db9875ffe9d2c16ea75cf40e661b2874359e3a5f75d761b3d9e863f7a434560992cfb020cce3e21e389381331d90de SHA512 24fd493643545a2998b053ed0d68caf6241f05bc2437e7cbeae33d2e1c63517a61449a1a18062f8e4e5a639295a2486925296ba3e54ccfa2ecdd56fa07132de8
DIST scons-4.2.0-user.html 1514655 BLAKE2B 036fd0e994d4a3dbf820e864c18f1dda2bb383b890919b3d99ca02e4f1f319b86050bf094309764bbb01585075697549e3168d66ee02caeee0fe4ca641f794a5 SHA512 b0dcf8d6ff32521f2ce92372a7efce4962268d2ca40645ec4b0d082e5a29ba5098488ba45bf36c9fb7e75996c7454ab80536052f43b9a533a22db05f466cd3e9
DIST scons-4.2.0-user.pdf 2813567 BLAKE2B 2787c9dbecaefccc5f4df2bcccc474ee69e9883f9efa8358f6da00690d9f3fad48f7b696908cbb4cc8f3b9c195f86e11c81301d931783e463d7b2f3a5d528fc3 SHA512 3c36879af2b40190b7b68b162cb39e32e1d7ee01fe063dabe5404d616ab3c9972ebc8a6ce4c0b54a633cfc6825808f93207132ac9c9cd60d9e6ca28e864d5f16
DIST scons-4.2.0.gh.tar.gz 5677165 BLAKE2B c298152db937810ab73afc304a9dc480c185ef0d6e86be5ec7f2022a7d1ed4d3df6ecc18148c3143d4e76a7ea0e50790db1224e66db68bace0759daba7f36a91 SHA512 138573f7203b52fad0527d8d88ceabe182273eff7e4b74125e0d7eda51c44408b07e2c702ee63214519392101d8bbb30013e6d34000eaeb530a816c17396de97
diff --git a/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch b/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch
deleted file mode 100644
index d187a17ae60..00000000000
--- a/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 929986e568446f54c2a99c309fbb4d05bd4af00a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 10 May 2018 08:01:08 +0200
-Subject: [PATCH] posix: Also force common toolchain vars for Gentoo
-
----
- src/SCons/Platform/posix.py | 20 ++++++++++++++++++++
- src/SCons/Tool/cc.py | 3 ++-
- src/SCons/Tool/cxx.py | 3 ++-
- src/SCons/Tool/link.py | 3 ++-
- 4 files changed, 26 insertions(+), 3 deletions(-)
-
-diff --git a/src/SCons/Platform/posix.py b/src/SCons/Platform/posix.py
-index 739310a1..ef7528e0 100644
---- a/src/SCons/Platform/posix.py
-+++ b/src/SCons/Platform/posix.py
-@@ -95,6 +95,26 @@ def generate(env):
- if 'ENV' in env:
- new_env.update(env['ENV'])
- env['ENV'] = new_env
-+
-+ # Furthermore, force common compiler/linker variables as well
-+ envvar_mapping = {
-+ 'AR': 'AR',
-+ 'AS': 'AS',
-+ 'ASFLAGS': 'ASFLAGS',
-+ 'CC': 'CC',
-+ 'CXX': 'CXX',
-+ 'CFLAGS': 'CFLAGS',
-+ 'CXXFLAGS': 'CXXFLAGS',
-+ 'CPPFLAGS': 'CPPFLAGS',
-+ 'LDFLAGS': 'LINKFLAGS',
-+ }
-+
-+ for envvar, toolvar in envvar_mapping.items():
-+ if toolvar not in env and envvar in env['ENV']:
-+ val = env['ENV'][envvar]
-+ if toolvar.endswith('FLAGS'):
-+ val = SCons.Util.CLVar(val)
-+ env[toolvar] = val
- else:
- if 'ENV' not in env:
- env['ENV'] = {}
-diff --git a/src/SCons/Tool/cc.py b/src/SCons/Tool/cc.py
-index 590ec5fd..5f9229a0 100644
---- a/src/SCons/Tool/cc.py
-+++ b/src/SCons/Tool/cc.py
-@@ -80,7 +80,8 @@ def generate(env):
-
- if 'CC' not in env:
- env['CC'] = env.Detect(compilers) or compilers[0]
-- env['CFLAGS'] = SCons.Util.CLVar('')
-+ if 'CFLAGS' not in env:
-+ env['CFLAGS'] = SCons.Util.CLVar('')
- env['CCCOM'] = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
- env['SHCC'] = '$CC'
- env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS')
-diff --git a/src/SCons/Tool/cxx.py b/src/SCons/Tool/cxx.py
-index 430851c8..ca5ab563 100644
---- a/src/SCons/Tool/cxx.py
-+++ b/src/SCons/Tool/cxx.py
-@@ -74,7 +74,8 @@ def generate(env):
-
- if 'CXX' not in env:
- env['CXX'] = env.Detect(compilers) or compilers[0]
-- env['CXXFLAGS'] = SCons.Util.CLVar('')
-+ if 'CXXFLAGS' not in env:
-+ env['CXXFLAGS'] = SCons.Util.CLVar('')
- env['CXXCOM'] = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
- env['SHCXX'] = '$CXX'
- env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
-diff --git a/src/SCons/Tool/link.py b/src/SCons/Tool/link.py
-index 5adc6ca2..a12ea8ed 100644
---- a/src/SCons/Tool/link.py
-+++ b/src/SCons/Tool/link.py
-@@ -318,7 +318,8 @@ def generate(env):
-
- env['SMARTLINK'] = smart_link
- env['LINK'] = "$SMARTLINK"
-- env['LINKFLAGS'] = SCons.Util.CLVar('')
-+ if 'LINKFLAGS' not in env:
-+ env['LINKFLAGS'] = SCons.Util.CLVar('')
-
- # __RPATH is only set to something ($_RPATH typically) on platforms that support it.
- env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
---
-2.20.1
-
diff --git a/dev-util/scons/scons-4.1.0-r1.ebuild b/dev-util/scons/scons-4.1.0-r1.ebuild
deleted file mode 100644
index 3f27b8197d8..00000000000
--- a/dev-util/scons/scons-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="https://www.scons.org/"
-SRC_URI="
- https://downloads.sourceforge.net/project/scons/scons/${PV}/${P}.tar.gz
- doc? (
- https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
- https://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
- )
- test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-
-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"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- test? (
- dev-libs/libxml2[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- )
-"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
- # support env passthrough for Gentoo ebuilds
- "${FILESDIR}"/scons-4.1.0-env-passthrough.patch
- # respect CC, CXX, C*FLAGS, LDFLAGS by default
- "${FILESDIR}"/scons-4.0.0-respect-cc-etc-r1.patch
-)
-
-src_unpack() {
- # use the git directory structure, but put pregenerated release
- # inside src/ subdirectory to make our life easier
- if use test; then
- unpack "${P}.gh.tar.gz"
- else
- mkdir -p "${P}"/src || die
- fi
-
- tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
-}
-
-src_prepare() {
- # apply patches relatively to top directory
- cd "${WORKDIR}/${P}" || die
- distutils-r1_src_prepare
-
- # manpage install is completely broken
- sed -i -e '/build\/doc\/man/d' src/setup.cfg || die
-
- if use test; then
- local remove_tests=(
- # TODO: does not respect PATH?
- test/Clang
- # broken
- test/DVIPDF/DVIPDFFLAGS.py
- test/Java/swig-dependencies.py
- test/Java/multi-step.py
- )
- rm -r "${remove_tests[@]}" || die
- fi
-}
-
-python_test() {
- local -x COLUMNS=80
- # set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
- local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
- # unset some env variables to pass appropriate tests
- unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
- cd "${WORKDIR}/${P}" || die
- "${EPYTHON}" runtest.py -a --passed \
- -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-
- # runtest.py script returns "0" if all tests are passed
- # and returns "2" if there are any tests with "no result"
- # (i.e. in case if some tools are not installed or it's Windows specific tests)
- [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- doman *.1
- use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/scons/files/, dev-util/scons/
@ 2021-10-14 9:13 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2021-10-14 9:13 UTC (permalink / raw
To: gentoo-commits
commit: 6342804cddb5845db79f752a74f262ffd6f74cc7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 14 09:11:41 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 14 09:11:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6342804c
dev-util/scons: Revert "Remove old" (restore 4.1.0 for now)
This reverts commit cfaacfcffc6895ebe3d021acedf2d71de76f7dc8.
Restore 4.1.0 for now because Mixxx can't build without it.
Bug: https://bugs.gentoo.org/806085
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/scons/Manifest | 4 +
.../files/scons-4.0.0-respect-cc-etc-r1.patch | 88 +++++++++++++++++++
dev-util/scons/scons-4.1.0-r1.ebuild | 98 ++++++++++++++++++++++
3 files changed, 190 insertions(+)
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 1a3cad8d5ab..b7a44b31276 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,3 +1,7 @@
+DIST scons-4.1.0-user.html 1454432 BLAKE2B 9fac4d7bfb4b25708bc4cc48d952beb030f88181af5dfee63090f726b1a82443c192c63ec5939869967ef8f374e8599321212971439fb265fb050b263681c9f8 SHA512 74f1349fa61dac9e66cfb863cb3126d07ce5f421b3e87d0220eb32bd5017ba8f6cf96eb8cb5ee45c39022671aa9f2d0408d4039970c438a69c002445aea510be
+DIST scons-4.1.0-user.pdf 2691364 BLAKE2B a910a09fa936d4d6f8dc967676d5aa009aac58a5a4566399b3ddc3512ac0259731e6c5399722fefadb3b79d8f89a5257e2e9bc2fa4d65697c8293ab995248d64 SHA512 64584731a59b59b78283be3876ecca91d742f83da2653d0de17922bec01e3c9cea1ce2ce3c8dc718597910ba86ed2c8aff0f7ae371bf763439b57a6d5484e1a7
+DIST scons-4.1.0.gh.tar.gz 5609204 BLAKE2B ede3d47a1ec652b9248681e26738073e9d01daab7ffeccc58f0fcadb79661e30edb9a35a511518e4a58459243acb027afd8fa5849b0f9e4bae451055f7b1a062 SHA512 f79b86bb09783767b3872cfb8efb665372714a604af2aaf3adc66eee63d3afe27bc6b2aab83813743c83f71c81c800d42842e916501787ba402ce2726dda9b44
+DIST scons-4.1.0.tar.gz 3007701 BLAKE2B 70ab64ecfd89fa2af1d78a33fcef82a5f7db9875ffe9d2c16ea75cf40e661b2874359e3a5f75d761b3d9e863f7a434560992cfb020cce3e21e389381331d90de SHA512 24fd493643545a2998b053ed0d68caf6241f05bc2437e7cbeae33d2e1c63517a61449a1a18062f8e4e5a639295a2486925296ba3e54ccfa2ecdd56fa07132de8
DIST scons-4.2.0-user.html 1514655 BLAKE2B 036fd0e994d4a3dbf820e864c18f1dda2bb383b890919b3d99ca02e4f1f319b86050bf094309764bbb01585075697549e3168d66ee02caeee0fe4ca641f794a5 SHA512 b0dcf8d6ff32521f2ce92372a7efce4962268d2ca40645ec4b0d082e5a29ba5098488ba45bf36c9fb7e75996c7454ab80536052f43b9a533a22db05f466cd3e9
DIST scons-4.2.0-user.pdf 2813567 BLAKE2B 2787c9dbecaefccc5f4df2bcccc474ee69e9883f9efa8358f6da00690d9f3fad48f7b696908cbb4cc8f3b9c195f86e11c81301d931783e463d7b2f3a5d528fc3 SHA512 3c36879af2b40190b7b68b162cb39e32e1d7ee01fe063dabe5404d616ab3c9972ebc8a6ce4c0b54a633cfc6825808f93207132ac9c9cd60d9e6ca28e864d5f16
DIST scons-4.2.0.gh.tar.gz 5677165 BLAKE2B c298152db937810ab73afc304a9dc480c185ef0d6e86be5ec7f2022a7d1ed4d3df6ecc18148c3143d4e76a7ea0e50790db1224e66db68bace0759daba7f36a91 SHA512 138573f7203b52fad0527d8d88ceabe182273eff7e4b74125e0d7eda51c44408b07e2c702ee63214519392101d8bbb30013e6d34000eaeb530a816c17396de97
diff --git a/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch b/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch
new file mode 100644
index 00000000000..d187a17ae60
--- /dev/null
+++ b/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch
@@ -0,0 +1,88 @@
+From 929986e568446f54c2a99c309fbb4d05bd4af00a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 10 May 2018 08:01:08 +0200
+Subject: [PATCH] posix: Also force common toolchain vars for Gentoo
+
+---
+ src/SCons/Platform/posix.py | 20 ++++++++++++++++++++
+ src/SCons/Tool/cc.py | 3 ++-
+ src/SCons/Tool/cxx.py | 3 ++-
+ src/SCons/Tool/link.py | 3 ++-
+ 4 files changed, 26 insertions(+), 3 deletions(-)
+
+diff --git a/src/SCons/Platform/posix.py b/src/SCons/Platform/posix.py
+index 739310a1..ef7528e0 100644
+--- a/src/SCons/Platform/posix.py
++++ b/src/SCons/Platform/posix.py
+@@ -95,6 +95,26 @@ def generate(env):
+ if 'ENV' in env:
+ new_env.update(env['ENV'])
+ env['ENV'] = new_env
++
++ # Furthermore, force common compiler/linker variables as well
++ envvar_mapping = {
++ 'AR': 'AR',
++ 'AS': 'AS',
++ 'ASFLAGS': 'ASFLAGS',
++ 'CC': 'CC',
++ 'CXX': 'CXX',
++ 'CFLAGS': 'CFLAGS',
++ 'CXXFLAGS': 'CXXFLAGS',
++ 'CPPFLAGS': 'CPPFLAGS',
++ 'LDFLAGS': 'LINKFLAGS',
++ }
++
++ for envvar, toolvar in envvar_mapping.items():
++ if toolvar not in env and envvar in env['ENV']:
++ val = env['ENV'][envvar]
++ if toolvar.endswith('FLAGS'):
++ val = SCons.Util.CLVar(val)
++ env[toolvar] = val
+ else:
+ if 'ENV' not in env:
+ env['ENV'] = {}
+diff --git a/src/SCons/Tool/cc.py b/src/SCons/Tool/cc.py
+index 590ec5fd..5f9229a0 100644
+--- a/src/SCons/Tool/cc.py
++++ b/src/SCons/Tool/cc.py
+@@ -80,7 +80,8 @@ def generate(env):
+
+ if 'CC' not in env:
+ env['CC'] = env.Detect(compilers) or compilers[0]
+- env['CFLAGS'] = SCons.Util.CLVar('')
++ if 'CFLAGS' not in env:
++ env['CFLAGS'] = SCons.Util.CLVar('')
+ env['CCCOM'] = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
+ env['SHCC'] = '$CC'
+ env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS')
+diff --git a/src/SCons/Tool/cxx.py b/src/SCons/Tool/cxx.py
+index 430851c8..ca5ab563 100644
+--- a/src/SCons/Tool/cxx.py
++++ b/src/SCons/Tool/cxx.py
+@@ -74,7 +74,8 @@ def generate(env):
+
+ if 'CXX' not in env:
+ env['CXX'] = env.Detect(compilers) or compilers[0]
+- env['CXXFLAGS'] = SCons.Util.CLVar('')
++ if 'CXXFLAGS' not in env:
++ env['CXXFLAGS'] = SCons.Util.CLVar('')
+ env['CXXCOM'] = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
+ env['SHCXX'] = '$CXX'
+ env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
+diff --git a/src/SCons/Tool/link.py b/src/SCons/Tool/link.py
+index 5adc6ca2..a12ea8ed 100644
+--- a/src/SCons/Tool/link.py
++++ b/src/SCons/Tool/link.py
+@@ -318,7 +318,8 @@ def generate(env):
+
+ env['SMARTLINK'] = smart_link
+ env['LINK'] = "$SMARTLINK"
+- env['LINKFLAGS'] = SCons.Util.CLVar('')
++ if 'LINKFLAGS' not in env:
++ env['LINKFLAGS'] = SCons.Util.CLVar('')
+
+ # __RPATH is only set to something ($_RPATH typically) on platforms that support it.
+ env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
+--
+2.20.1
+
diff --git a/dev-util/scons/scons-4.1.0-r1.ebuild b/dev-util/scons/scons-4.1.0-r1.ebuild
new file mode 100644
index 00000000000..3f27b8197d8
--- /dev/null
+++ b/dev-util/scons/scons-4.1.0-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="https://www.scons.org/"
+SRC_URI="
+ https://downloads.sourceforge.net/project/scons/scons/${PV}/${P}.tar.gz
+ doc? (
+ https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+ https://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
+ )
+ test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
+
+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"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ test? (
+ dev-libs/libxml2[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ )
+"
+
+S=${WORKDIR}/${P}/src
+
+PATCHES=(
+ # support env passthrough for Gentoo ebuilds
+ "${FILESDIR}"/scons-4.1.0-env-passthrough.patch
+ # respect CC, CXX, C*FLAGS, LDFLAGS by default
+ "${FILESDIR}"/scons-4.0.0-respect-cc-etc-r1.patch
+)
+
+src_unpack() {
+ # use the git directory structure, but put pregenerated release
+ # inside src/ subdirectory to make our life easier
+ if use test; then
+ unpack "${P}.gh.tar.gz"
+ else
+ mkdir -p "${P}"/src || die
+ fi
+
+ tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
+}
+
+src_prepare() {
+ # apply patches relatively to top directory
+ cd "${WORKDIR}/${P}" || die
+ distutils-r1_src_prepare
+
+ # manpage install is completely broken
+ sed -i -e '/build\/doc\/man/d' src/setup.cfg || die
+
+ if use test; then
+ local remove_tests=(
+ # TODO: does not respect PATH?
+ test/Clang
+ # broken
+ test/DVIPDF/DVIPDFFLAGS.py
+ test/Java/swig-dependencies.py
+ test/Java/multi-step.py
+ )
+ rm -r "${remove_tests[@]}" || die
+ fi
+}
+
+python_test() {
+ local -x COLUMNS=80
+ # set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
+ local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
+ # unset some env variables to pass appropriate tests
+ unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+ cd "${WORKDIR}/${P}" || die
+ "${EPYTHON}" runtest.py -a --passed \
+ -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+
+ # runtest.py script returns "0" if all tests are passed
+ # and returns "2" if there are any tests with "no result"
+ # (i.e. in case if some tools are not installed or it's Windows specific tests)
+ [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ doman *.1
+ use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-10-14 9:13 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-21 10:20 [gentoo-commits] repo/gentoo:master commit in: dev-util/scons/files/, dev-util/scons/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2021-10-14 9:13 Sam James
2021-10-13 9:05 Michał Górny
2021-08-01 17:41 Michał Górny
2021-03-28 11:59 Michał Górny
2019-03-13 8:22 Michał Górny
2015-11-11 10:37 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox