From 1af033fc02e83882026a8cb34045c037b19c5a9c Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 17 Sep 2019 08:23:42 +0000 Subject: scons: updated to 3.1.1 RELEASE 3.1.1: - Remove obsoleted references to DeciderNeedsNode which could cause crash when using --debug=explain - Add Fix and test for crash in 3.1.0 when using Decider('MD5-timestamp') and --debug=explain - Added -fmerge-all-constants to flags that get included in both CCFLAGS and LINKFLAGS. - Fix issue 3415 - Update remaining usages of EnvironmentError to SConsEnvironmentError this patch fixes issues introduced in 3.1.0 where any of the following would cause SCons to error and exit: - CacheDir not write-able - JSON encoding errors for CacheDir config - JSON decoding errors for CacheDir config RELEASE 3.1.0: - Code to supply correct version-specifier argument to vswhere for VS version selection. - Enhanced --debug=explain output. Now the separate components of the dependency list are split up as follows: scons: rebuilding `file3' because: the dependency order changed: ->Sources Old:xxx New:zzz Old:yyy New:yyy Old:zzz New:xxx ->Depends ->Implicit Old:/usr/bin/python New:/usr/bin/python - Fix Issue 3350 - SCons Exception EnvironmentError is conflicting with Python's EnvironmentError. - Fix spurious rebuilds on second build for cases where builder has > 1 target and the source file is generated. This was causing the > 1th target to not have it's implicit list cleared when the source file was actually built, leaving an implicit list similar to follows for 2nd and higher target ['/usr/bin/python', 'xxx', 'yyy', 'zzz'] This was getting persisted to SConsign and on rebuild it would be corrected to be similar to this ['zzz', 'yyy', 'xxx', '/usr/bin/python'] Which would trigger a rebuild because the order changed. The fix involved added logic to mark all shared targets as peers and then ensure they're implicit list is all cleared together. - Fix Issue 3349 - SCons Exception EnvironmentError is conflicting with Python's EnvironmentError. Renamed to SConsEnvironmentError - Fix Issue 3350 - mslink failing when too many objects. This is resolved by adding TEMPFILEARGJOIN variable which specifies what character to join all the argements output into the tempfile. The default remains a space when mslink, msvc, or mslib tools are loaded they change the TEMPFILEARGJOIN to be a line separator (\r\n on win32) - Fix performance degradation for MD5-timestamp decider. NOTE: This changes the Decider() function arguments. From: def my_decider(dependency, target, prev_ni): To: def my_decider(dependency, target, prev_ni, repo_node): Where repo_node is the repository (or other) node to use to check if the node is out of date instead of dependency. - Additional fix to issue 3135 - Also handle 'pure' and 'elemental' type bound procedures - Fix issue 3135 - Handle Fortran submodules and type bound procedures - Upgraded and improved Visual Studio solution/project generation code using the MSVSProject builder. - Added support for Visual Studio 2017 and 2019. - Added support for the following per-variant parameters to the builder: - cpppaths: Provides per-variant include paths. - cppdefines: Provides per-variant preprocessor definitions. - Fix handling of Visual Studio Compilers to properly reject any unknown HOST_PLATFORM or TARGET_PLATFORM - Added support for Visual Studio 2019 toolset. - Update cache debug output to include cache hit rate. - No longer unintentionally hide exceptions in Action.py - Allow builders and pseudo-builders to inherit from OverrideEnvironments - Add logic to derive correct version argument to vswhere - Enable LaTeX scanner to find more than one include per line - scons-time takes more care closing files and uses safer mkdtemp to avoid possible races on multi-job runs. - Use importlib to dynamically load tool and platform modules instead of imp module - sconsign: default to .sconsign.dblite if no filename is specified. Be more informative in case of unsupported pickle protocol (py2 only). - Fix issue 3336 - on Windows, paths were being added to PATH even if tools were not found in those paths. - More fixes for newer Java versions (since 9): handle new jdk directory naming (jdk-X.Y instead of jdkX.Y) on Windows; handle two-digit major version. Docstrings improved. - Fixups for pylint: exception types, redefined functions, globals, etc. Some old code removed to resolve issues (hashlib is always present on modern Pythons; no longer need the code for 2.5-and-earlier optparse). cmp is not a builtin function in Py3, drop one (unused) use; replace one. Fix another instance of renaming to SConsEnvironmentError. Trailing whitespace. Consistently use not is/in (if not x is y -> if x is not y). - Add a PY3-only function for setting up the cachedir that should be less prone to races. Add a hack to the PY2 version (from Issue 3351) to be less prone to a race in the check for old-style cache. - Fix coding error in docbook tool only exercised when using python lxml - Recognize two additional GNU compiler header directory options in ParseFlags: -iquote and -idirafter. - Fix more re patterns that contain \ but not specified as raw strings (affects scanners for D, LaTeX, swig) --- devel/scons/Makefile | 6 +++--- devel/scons/PLIST | 5 ++++- devel/scons/distinfo | 10 +++++----- 3 files changed, 12 insertions(+), 9 deletions(-) (limited to 'devel') diff --git a/devel/scons/Makefile b/devel/scons/Makefile index 9eb2639c7f1..f173e36733d 100644 --- a/devel/scons/Makefile +++ b/devel/scons/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.45 2019/05/06 15:11:05 adam Exp $ +# $NetBSD: Makefile,v 1.46 2019/09/17 08:23:42 adam Exp $ -DISTNAME= scons-3.0.5 +DISTNAME= scons-3.1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=s/scons/} MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.scons.org/ +HOMEPAGE= https://www.scons.org/ COMMENT= Python-based, open-source build system LICENSE= mit diff --git a/devel/scons/PLIST b/devel/scons/PLIST index 568475a921f..3fbe600e1de 100644 --- a/devel/scons/PLIST +++ b/devel/scons/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2019/03/05 19:30:01 adam Exp $ +@comment $NetBSD: PLIST,v 1.19 2019/09/17 08:23:42 adam Exp $ bin/scons bin/scons-${PKGVERSION} bin/scons-${PKGVERSION}.bat @@ -574,6 +574,9 @@ lib/scons/SCons/Warnings.pyo lib/scons/SCons/__init__.py lib/scons/SCons/__init__.pyc lib/scons/SCons/__init__.pyo +lib/scons/SCons/__main__.py +lib/scons/SCons/__main__.pyc +lib/scons/SCons/__main__.pyo lib/scons/SCons/compat/__init__.py lib/scons/SCons/compat/__init__.pyc lib/scons/SCons/compat/__init__.pyo diff --git a/devel/scons/distinfo b/devel/scons/distinfo index 852ebd10521..78d04979a04 100644 --- a/devel/scons/distinfo +++ b/devel/scons/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.26 2019/05/06 15:11:05 adam Exp $ +$NetBSD: distinfo,v 1.27 2019/09/17 08:23:42 adam Exp $ -SHA1 (scons-3.0.5.tar.gz) = 4cf0881ddffbb1b7e2f6d7d6dd4a6930f651453f -RMD160 (scons-3.0.5.tar.gz) = b55b2adbc780dc3dd08234ab89be71e581589e4b -SHA512 (scons-3.0.5.tar.gz) = 079bfd94099429c81d6c47b2bbfed1a459280bce96e94c2db0adb0d5b66123d4abf9260e2d61f0852ebfbebc8c7b3c3e9fcffdd444887c9758d3d504de26057f -Size (scons-3.0.5.tar.gz) = 578868 bytes +SHA1 (scons-3.1.1.tar.gz) = 8ab2c9d344d747152feb16ed51598e3d952045da +RMD160 (scons-3.1.1.tar.gz) = f4b0533c13fdcb3e9ac2d7b4207645509f434d29 +SHA512 (scons-3.1.1.tar.gz) = 719c4504608bfed0dc2ba8e107e976e3adb07a742f574955f8551e365508f31898d7a0c286d282edde113d2fd685e6e7af6df46f1abbdac306af66e61a8c2632 +Size (scons-3.1.1.tar.gz) = 584072 bytes SHA1 (patch-engine_SCons_Platform___init__.py) = 51ea2b6b3bc0ee11c863c924d60ec4b5cbde8416 SHA1 (patch-setup.py) = 5a00a10b7374a38f4353c4a49287e3e0df2cb584 -- cgit v1.2.3