mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 06:48:18 -07:00
dev-util/scons: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
@@ -1,9 +1,3 @@
|
||||
DIST scons-3.1.1-user.html 1134061 BLAKE2B de025ff73ecacec591c63b22bb3f934962a34fa16bec47a58972b97ba28f9a88254b419b4d2edeb2d920e70cf3e0c739df5357956c8586e5377afcd4125ba0a8 SHA512 bd00bcdcd01b192a42110ec65cdb906963af08f5bbc9d5e61624b5b5b1a667b115b099ce2ef71444a8998171a5544f4caecf3acec9715876d4e9e5baa581e60d
|
||||
DIST scons-3.1.1-user.pdf 2564248 BLAKE2B 702e57a9646779ff1aa077aa7ae7a815d004cda08166f948ef3b893a786c7ccf13e9d1f8621640573802acd0b6a7acaaf68ebea984d5922112a30c4457740bc4 SHA512 0c0f8e93e3bddd9dc0ec661f629f2995ec9375908b3b7bf2b67c9518571cb31754d13fca46fc1182019976e5c0a417832447692ff61f5ee4613b7f56c7891594
|
||||
DIST scons-3.1.1.tar.gz 663878 BLAKE2B 095d5f45885ac12937066be247194e70d33e8f5dc0955e7d693c4b0d3a4b61e776bc1d64cd00ebc89d1e85a7992747b8f448255a76c1b6c2d9df8fa173967711 SHA512 2e80b45571679d8acc0554273538f56163488df5aa9007c7c9c3a6deb2698909ab05da8df91502ea287c0cc0ff0a98f226454f67fcfb7a943570f673f4bd8f54
|
||||
DIST scons-3.1.2-user.html 1126908 BLAKE2B 38e7695b6ef1e79b3eed4455fbe84ec1587be3f21c1c90cfa6602b344c52c704f021ed8e611abaf2e24ca06c5116e79fb78ca724c9920186cce35feccbac899d SHA512 a13ed1157f6aad25acbad6e1e3d2c0a16a14dd1d5fa369ba27777ca30eeb31ce37c735c1870c80f7343f0f98a4305fe1ef7c2b679cf2cb9c0d6670f34a3aeba8
|
||||
DIST scons-3.1.2-user.pdf 2557502 BLAKE2B 1c89d845d23c4e434c9db11d8730121f0b8dc6f2fca21dabe3e7204373cdf743d831a1835731332e39ccd7f3f49da068ba34a33a2937e9dd205e38d9c8b2b321 SHA512 9da887c157cb95f7802cb4b96080b0e56f2ad7663021b8be0839e71d473422fe9dd0dadf0ad1b067160c39511e91c6b3d9aaff8e238bb46b10a03ae89b12e169
|
||||
DIST scons-3.1.2.tar.gz 668298 BLAKE2B 14251e2bab425dfc31d1d6d9325a67725dae42576d2a5c204f0ff7948aa2da5aadd3fdf03bbbccd615757520fedee5e18ca2ba13aaf07a4ddfec330db4221203 SHA512 bfc0d58d33408a03eb37c1eff166af8139078026e6b43d6274afceac889d0a6743e359e89ad9a30be5ca43aeed26fba92fa4732854750b7d53091ef3e99b3d33
|
||||
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
|
||||
|
||||
@@ -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/engine/SCons/Platform/posix.py | 14 +++++++++++---
|
||||
1 file changed, 11 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py
|
||||
index 8db08db1..af34650c 100644
|
||||
--- a/src/engine/SCons/Platform/posix.py
|
||||
+++ b/src/engine/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
|
||||
|
||||
@@ -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/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 739310a1..ef7528e0 100644
|
||||
--- a/src/engine/SCons/Platform/posix.py
|
||||
+++ b/src/engine/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/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 5adc6ca2..a12ea8ed 100644
|
||||
--- a/src/engine/SCons/Tool/link.py
|
||||
+++ b/src/engine/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
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="doc"
|
||||
RESTRICT="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() {
|
||||
mkdir -p "${P}"/src || die
|
||||
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
|
||||
}
|
||||
|
||||
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}
|
||||
}
|
||||
@@ -1,59 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
# False positive due to commented code in setup.py
|
||||
DISTUTILS_USE_SETUPTOOLS=manual
|
||||
PYTHON_COMPAT=( python3_{7,8} )
|
||||
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
|
||||
)"
|
||||
|
||||
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"
|
||||
RESTRICT="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() {
|
||||
mkdir -p "${P}"/src || die
|
||||
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
|
||||
}
|
||||
|
||||
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}
|
||||
}
|
||||
Reference in New Issue
Block a user