On Fri, Apr 07, 2023 at 05:57:34PM +0200, Omar Polo wrote:
> On 2023/04/01 09:05:40 +0200, Omar Polo <o...@omarpolo.com> wrote:
> > 4.5.0 and 4.5.1 had a regression that took out almost all ports using
> > scons in the tree, but it was fixed for 4.5.2.
> >
> > I've built a few consumers without regressions. It could still use a
> > trip to a bulk just in case.
> >
> > ok?
>
> phessler@ (thanks!) put this in an aarch64 bulk: games/dxx-rebirth
> (+cc thfr@), the only failure due to the scons update, needs the
> backport of a few upstream commit, but then it builds fine.
>
> I'd like to commit this in a few days, provided nobody objects.
ok thfr@ for the dxx-rebirth part
>
> Index: devel/scons/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/devel/scons/Makefile,v
> retrieving revision 1.41
> diff -u -p -r1.41 Makefile
> --- devel/scons/Makefile 14 Nov 2022 17:17:01 -0000 1.41
> +++ devel/scons/Makefile 22 Mar 2023 18:54:14 -0000
> @@ -1,10 +1,9 @@
> COMMENT= Python-based build system
>
> -MODPY_EGG_VERSION= 4.4.0
> +MODPY_EGG_VERSION= 4.5.2
> DISTNAME= SCons-${MODPY_EGG_VERSION}
> PKGNAME= ${DISTNAME:L}
> CATEGORIES= devel
> -REVISION= 1
>
> HOMEPAGE= https://www.scons.org/
>
> Index: devel/scons/distinfo
> ===================================================================
> RCS file: /home/cvs/ports/devel/scons/distinfo,v
> retrieving revision 1.21
> diff -u -p -r1.21 distinfo
> --- devel/scons/distinfo 21 Aug 2022 08:59:46 -0000 1.21
> +++ devel/scons/distinfo 22 Mar 2023 18:54:20 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (SCons-4.4.0.tar.gz) = dwPE6dIgC0hUoxgAwdvUWH4fqG519YeVx0C8+n7Kfqo=
> -SIZE (SCons-4.4.0.tar.gz) = 3096859
> +SHA256 (SCons-4.5.2.tar.gz) = gTNgsrzkdrycwSoPOiLUbOUgeWs1JVcgLLB9PkAvVFg=
> +SIZE (SCons-4.5.2.tar.gz) = 3194717
> Index: devel/scons/patches/patch-setup_cfg
> ===================================================================
> RCS file: /home/cvs/ports/devel/scons/patches/patch-setup_cfg,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-setup_cfg
> --- devel/scons/patches/patch-setup_cfg 21 Aug 2022 08:59:46 -0000
> 1.3
> +++ devel/scons/patches/patch-setup_cfg 6 Mar 2023 11:14:18 -0000
> @@ -1,7 +1,7 @@
> Index: setup.cfg
> --- setup.cfg.orig
> +++ setup.cfg
> -@@ -58,7 +58,7 @@ console_scripts =
> +@@ -60,7 +60,7 @@ console_scripts =
> SCons.Tool.docbook = *.*
>
> [options.data_files]
> Index: devel/scons/pkg/PLIST
> ===================================================================
> RCS file: /home/cvs/ports/devel/scons/pkg/PLIST,v
> retrieving revision 1.19
> diff -u -p -r1.19 PLIST
> --- devel/scons/pkg/PLIST 14 Nov 2022 17:17:01 -0000 1.19
> +++ devel/scons/pkg/PLIST 6 Mar 2023 11:21:45 -0000
> @@ -20,7 +20,6 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/SCons/EnvironmentValuesTest.py
> lib/python${MODPY_VERSION}/site-packages/SCons/Errors.py
> lib/python${MODPY_VERSION}/site-packages/SCons/Executor.py
> -lib/python${MODPY_VERSION}/site-packages/SCons/Job.py
> lib/python${MODPY_VERSION}/site-packages/SCons/Memoize.py
> lib/python${MODPY_VERSION}/site-packages/SCons/Node/
> lib/python${MODPY_VERSION}/site-packages/SCons/Node/Alias.py
> @@ -133,7 +132,14 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/SCons/Script/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/SCons/Script/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/SCons/Subst.py
> -lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster.py
> +lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/
> +lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/Job.py
> +lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}Job.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}Job.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/386asm.py
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/DCommon.py
> @@ -176,6 +182,7 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}WinSDK.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/README.rst
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -377,6 +384,8 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}python.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}qt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}qt.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}qt3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}qt3.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}rmic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}rmic.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}rpcgen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -1964,6 +1973,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/pdftex.py
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/python.py
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/qt.py
> +lib/python${MODPY_VERSION}/site-packages/SCons/Tool/qt3.py
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/rmic.py
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/rpcgen.py
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/rpm.py
> @@ -1990,7 +2000,20 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/xgettext.py
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/yacc.py
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/zip.py
> -lib/python${MODPY_VERSION}/site-packages/SCons/Util.py
> +lib/python${MODPY_VERSION}/site-packages/SCons/Util/
> +lib/python${MODPY_VERSION}/site-packages/SCons/Util/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}envs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}envs.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}hashes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}hashes.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/SCons/Util/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/SCons/Util/envs.py
> +lib/python${MODPY_VERSION}/site-packages/SCons/Util/hashes.py
> +lib/python${MODPY_VERSION}/site-packages/SCons/Util/types.py
> lib/python${MODPY_VERSION}/site-packages/SCons/Utilities/
> lib/python${MODPY_VERSION}/site-packages/SCons/Utilities/ConfigureCache.py
> lib/python${MODPY_VERSION}/site-packages/SCons/Utilities/__init__.py
> @@ -2048,8 +2071,6 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Errors.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Executor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Executor.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Job.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Job.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Memoize.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Memoize.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}PathList.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> @@ -2060,10 +2081,6 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}SConsign.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Subst.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Subst.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Taskmaster.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Taskmaster.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Util.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Warnings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}Warnings.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/SCons/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> Index: games/dxx-rebirth/patches/patch-SConstruct
> ===================================================================
> RCS file: /home/cvs/ports/games/dxx-rebirth/patches/patch-SConstruct,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-SConstruct
> --- games/dxx-rebirth/patches/patch-SConstruct 3 Feb 2023 20:11:58
> -0000 1.7
> +++ games/dxx-rebirth/patches/patch-SConstruct 7 Apr 2023 15:44:04
> -0000
> @@ -1,5 +1,10 @@
> Remove all the -Werror= flags.
>
> +Backport of 769164a55bd74f2f11d14dd5175fbee01cf77638 ("Fix SConstruct
> +for scons 4.5.0+; env['CPPDEFINES'] may return a deque object") and
> +partial backport of 189ac23f61605903eb3eaa0004d287b7bd9296bc ("Prefer
> +V.copy over V[:]")
> +
> Index: SConstruct
> --- SConstruct.orig
> +++ SConstruct
> @@ -38,3 +43,48 @@ Index: SConstruct
> ])
> env.Append(
> CXXFLAGS = ['-funsigned-char'],
> +@@ -4831,7 +4821,7 @@ class DXXProgram(DXXCommon):
> + # Bypass ccache, if any, since this is a preprocess only
> + # call.
> + kwargs['CXXFLAGS'] = (env['CXXFLAGS'] or []) + ['-E']
> +- kwargs['CPPDEFINES'] = (env['CPPDEFINES'] or []) + [
> ++ kwargs['CPPDEFINES'] = list(env['CPPDEFINES'] or []) + [
> + # Define these tokens to themselves so
> that
> + # `#ifndef` does not try to redefine
> them.
> + ('DXX_KCONFIG_UI_ENUM',
> 'DXX_KCONFIG_UI_ENUM'),
> +@@ -4851,7 +4841,7 @@ class DXXProgram(DXXCommon):
> + def _apply_target_name(self,name):
> + return os.path.join(os.path.dirname(name), '.%s.%s' %
> (self.target, os.path.splitext(os.path.basename(name))[0]))
> + def _apply_env_version_seq(self,env,_empty={}):
> +- return _empty if self.user_settings.pch else {'CPPDEFINES' :
> env['CPPDEFINES'] + [('DXX_VERSION_SEQ', self.DXX_VERSION_SEQ)]}
> ++ return _empty if self.user_settings.pch else {'CPPDEFINES' :
> list(env['CPPDEFINES']) + [('DXX_VERSION_SEQ', self.DXX_VERSION_SEQ)]}
> + get_objects_similar_arch_ogl =
> DXXCommon.create_lazy_object_states_getter((LazyObjectState(sources=(
> + 'similar/arch/ogl/gr.cpp',
> + 'similar/arch/ogl/ogl.cpp',
> +@@ -4947,7 +4937,7 @@ class DXXProgram(DXXCommon):
> + ), LazyObjectState(sources=(
> + 'similar/main/inferno.cpp',
> + ),
> +- transform_env = (lambda self, env: {'CPPDEFINES' :
> env['CPPDEFINES'] + env.__dxx_CPPDEFINE_SHAREPATH +
> env.__dxx_CPPDEFINE_git_version}),
> ++ transform_env = (lambda self, env: {'CPPDEFINES' :
> list(env['CPPDEFINES']) + env.__dxx_CPPDEFINE_SHAREPATH +
> env.__dxx_CPPDEFINE_git_version}),
> + transform_target=_apply_target_name,
> + ), LazyObjectState(sources=(
> + 'similar/main/kconfig.cpp',
> +@@ -4957,7 +4947,7 @@ class DXXProgram(DXXCommon):
> + ), LazyObjectState(sources=(
> + 'similar/misc/physfsx.cpp',
> + ),
> +- transform_env = (lambda self, env: {'CPPDEFINES' :
> env['CPPDEFINES'] + env.__dxx_CPPDEFINE_SHAREPATH}),
> ++ transform_env = (lambda self, env: {'CPPDEFINES' :
> list(env['CPPDEFINES']) + env.__dxx_CPPDEFINE_SHAREPATH}),
> + transform_target=_apply_target_name,
> + ), LazyObjectState(sources=(
> + 'similar/main/playsave.cpp',
> +@@ -5168,7 +5158,7 @@ class DXXProgram(DXXCommon):
> + objects.extend(self.get_objects_editor())
> +
> objects.extend(static_archive_construction.get_objects_editor())
> + versid_build_environ = ['CXX', 'CPPFLAGS', 'CXXFLAGS',
> 'LINKFLAGS']
> +- versid_cppdefines = env['CPPDEFINES'][:]
> ++ versid_cppdefines = env['CPPDEFINES'].copy()
> + extra_version = user_settings.extra_version
> + if extra_version is None:
> + extra_version = 'v%u.%u' % (self.VERSION_MAJOR,
> self.VERSION_MINOR)
