mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-29 17:41:05 +02:00
dev-util/scons: Drop unnecessary package
There isn't anything that is using scons, so just drop it.
This commit is contained in:
Krzesimir Nowak
parent
d620d52425
commit
be4949f48b
@ -1,4 +0,0 @@
|
||||
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
|
||||
@ -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
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
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] 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 | 15 ++++++++++++---
|
||||
1 file changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
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,18 @@ 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:/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:
|
||||
+ 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:/snap/bin'
|
||||
+
|
||||
env['OBJPREFIX'] = ''
|
||||
env['OBJSUFFIX'] = '.o'
|
||||
env['SHOBJPREFIX'] = '$OBJPREFIX'
|
||||
--
|
||||
2.30.0
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>mgorny@gentoo.org</email>
|
||||
<name>Michał Górny</name>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
SCons is a make replacement providing a range of enhanced
|
||||
features such as automated dependency generation and built in
|
||||
compilation cache support. SCons rule sets are Python scripts so
|
||||
as well as the features it provides itself SCons allows you to use
|
||||
the full power of Python to control compilation.
|
||||
</longdescription>
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">scons</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -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}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user