From 3b6c49529bbd7cc470bb3cf166fc9ce8a5891255 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sat, 11 Jul 2020 11:49:29 +0200 Subject: dev-util/scons: Bump to 4.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-util/scons/Manifest | 4 + .../scons/files/scons-4.0.0-env-passthrough.patch | 40 ++++++++++ .../files/scons-4.0.0-respect-cc-etc-r1.patch | 88 +++++++++++++++++++++ dev-util/scons/scons-4.0.0.ebuild | 89 ++++++++++++++++++++++ 4 files changed, 221 insertions(+) create mode 100644 dev-util/scons/files/scons-4.0.0-env-passthrough.patch create mode 100644 dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch create mode 100644 dev-util/scons/scons-4.0.0.ebuild (limited to 'dev-util/scons') diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest index 5e209cb4ed40..19474baa8d4c 100644 --- a/dev-util/scons/Manifest +++ b/dev-util/scons/Manifest @@ -6,3 +6,7 @@ DIST scons-3.1.2-user.html 1126908 BLAKE2B 38e7695b6ef1e79b3eed4455fbe84ec1587be DIST scons-3.1.2-user.pdf 2557502 BLAKE2B 1c89d845d23c4e434c9db11d8730121f0b8dc6f2fca21dabe3e7204373cdf743d831a1835731332e39ccd7f3f49da068ba34a33a2937e9dd205e38d9c8b2b321 SHA512 9da887c157cb95f7802cb4b96080b0e56f2ad7663021b8be0839e71d473422fe9dd0dadf0ad1b067160c39511e91c6b3d9aaff8e238bb46b10a03ae89b12e169 DIST scons-3.1.2.gh.tar.gz 5534888 BLAKE2B 63e8b069cfddfed6a2ce8bcb7816b51b1881ca7a1a3e552f2eec5ecd1deae80720b0acfb711ab17067efdc9d0e4aea696e9f4eee6b374071bfc60e7bb79cc58a SHA512 b096501ea37e62f596f16b46b4022ad7979f359b10849d4c5fa17731a6c3ec34e0890374de175a8aa7539ae677777142ccf5dfae39a74696efcdbcc00e89bccf DIST scons-3.1.2.tar.gz 668298 BLAKE2B 14251e2bab425dfc31d1d6d9325a67725dae42576d2a5c204f0ff7948aa2da5aadd3fdf03bbbccd615757520fedee5e18ca2ba13aaf07a4ddfec330db4221203 SHA512 bfc0d58d33408a03eb37c1eff166af8139078026e6b43d6274afceac889d0a6743e359e89ad9a30be5ca43aeed26fba92fa4732854750b7d53091ef3e99b3d33 +DIST scons-4.0.0-user.html 1414886 BLAKE2B 1005a79040a4e035fa667a7c2f6231300c5fcade558d373eb6af36f4a8fdfcdb9c48ca0e5ecc36add72548f4ce6b904a745cbd6275649e1a1ce0e9172843259d SHA512 d4ce7b528ae714617a20adf49c66beb478d432f33f095ffb05f30038b2295cfe658c1dab421563dfae674bd0d4c343b98058cb8decc5393883675f4c9a7cf5a6 +DIST scons-4.0.0-user.pdf 2468838 BLAKE2B 6541fbc9d8f409ccde07746cb2a6e046fe4a4b868c2b6b80401c30c9d99a27acb2a4aedba9f47ba9e4cf8ac62510bec43a9aac33cba6912b837e13baeb996353 SHA512 cc62fd88dc0dda77515328b434492f8dbc0b4f615a2f3bb4841391ded7fbc738050b2ca7308c820d55efa59c28540391bd546ecec909b1fa7df66a944bdaa8aa +DIST scons-4.0.0.gh.tar.gz 5584060 BLAKE2B 316be6af0cf52181391ba3251315a0d7da6024a3c650c3de927ff9db041aba096a95f09a7a13f64f78e20473490eb08fb2b0da191c9c3957fad9113e2d3dab14 SHA512 8277c8ceeba5e9612e8c757b3ab736cf116f66e707f4127b1e09f21d3a71ca7fd13dde0453f73b97c168cd05d8ba97084c010f3dcc1e29bb26ebbbeae9ea8338 +DIST scons-4.0.0.tar.gz 2874600 BLAKE2B 439b4e32cb62f5b9546af771eb292a5ff36eddb23fbd169fe065d2dbc3c3916d0551a2807bf765952384e46e036fe4b6142b739b5cfe385217539e1a22daf5ff SHA512 38c8f6600bc5f4b5385eb65ff1e98e8464dcea2a1128173f883a06822eca2e250998c666418a9cbbe2c30ff26da4de3c5fdd68381e68708d93e59bea8680337c 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 new file mode 100644 index 000000000000..23538395e972 --- /dev/null +++ b/dev-util/scons/files/scons-4.0.0-env-passthrough.patch @@ -0,0 +1,40 @@ +From f2f8536be12f1d095382e7598060c1eb51eb5337 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +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/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 000000000000..d187a17ae60c --- /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?= +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.0.0.ebuild b/dev-util/scons/scons-4.0.0.ebuild new file mode 100644 index 000000000000..83796abe817a --- /dev/null +++ b/dev-util/scons/scons-4.0.0.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{6,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 + ) + 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 ~x86-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 +} + +python_test() { + # 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() { + 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} +} -- cgit v1.2.3-65-gdbad