Mailing List Archive | ports@openbsd.org

From:: Rafael Sadowski <rafael@sizeofvoid.org>
Subject:: UPDATE: devel/scons
To:: ports@openbsd.org
Date:: Sun, 17 Aug 2025 14:55:21 +0200
Download raw body.
Thread
2025-08-17 12:55 Rafael Sadowski:
UPDATE: devel/scons
Mongodb 8 depends on a newer scons version. Unfortunately, the old
one 4 has a problem with that, which is ironic. I will provide
another patch for this. Everything else seems to build with this
version.

Feedback? OK?

diff --git a/devel/scons/Makefile b/devel/scons/Makefile
index 1011a0a104f..588eef5faf3 100644
--- a/devel/scons/Makefile
+++ b/devel/scons/Makefile
@@ -1,12 +1,9 @@
 COMMENT=	Python-based build system
 
-MODPY_DISTV=	4.6.0
-DISTNAME=	SCons-${MODPY_DISTV}
-PKGNAME=	${DISTNAME:L}
+MODPY_DISTV=	4.9.1
+DISTNAME=	scons-${MODPY_DISTV}
 CATEGORIES=	devel
 
-REVISION=	2
-
 HOMEPAGE=	https://www.scons.org/
 
 # MIT
@@ -18,4 +15,7 @@ MODPY_PYBUILD =		setuptools
 
 NO_TEST=	Yes
 
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/*.1 ${PREFIX}/man/man1
+
 .include <bsd.port.mk>
diff --git a/devel/scons/distinfo b/devel/scons/distinfo
index 12a2bc51478..d4ed6513530 100644
--- a/devel/scons/distinfo
+++ b/devel/scons/distinfo
@@ -1,2 +1,2 @@
-SHA256 (SCons-4.6.0.tar.gz) = fbKJWLGIuAD4A8KH0GgMw6x8Qi7Qsc+YlQQsUlZ4A+w=
-SIZE (SCons-4.6.0.tar.gz) = 3230138
+SHA256 (scons-4.9.1.tar.gz) = usrIgLouhtahVsEW4vjyv6grJXBG86wmZshcU8YVwzg=
+SIZE (scons-4.9.1.tar.gz) = 3252106
diff --git a/devel/scons/patches/patch-SCons_Tool___init___py b/devel/scons/patches/patch-SCons_Tool___init___py
index e997ed7e23c..d4e27ff7f71 100644
--- a/devel/scons/patches/patch-SCons_Tool___init___py
+++ b/devel/scons/patches/patch-SCons_Tool___init___py
@@ -1,12 +1,12 @@
 Index: SCons/Tool/__init__.py
 --- SCons/Tool/__init__.py.orig
 +++ SCons/Tool/__init__.py
-@@ -757,9 +757,9 @@ def tool_list(platform, env):
+@@ -759,9 +759,9 @@ def tool_list(platform, env):
      else:
          "prefer GNU tools on all other platforms"
          linkers = ['gnulink', 'ilink']
--        c_compilers = ['gcc', 'intelc', 'icc', 'cc']
--        cxx_compilers = ['g++', 'intelc', 'icc', 'cxx']
+-        c_compilers = ['gcc', 'clang', 'intelc', 'icc', 'cc']
+-        cxx_compilers = ['g++', 'clang++', 'intelc', 'icc', 'cxx']
 -        assemblers = ['gas', 'nasm', 'masm']
 +        c_compilers = ['cc']
 +        cxx_compilers = ['c++']
diff --git a/devel/scons/patches/patch-setup_cfg b/devel/scons/patches/patch-setup_cfg
deleted file mode 100644
index 95397eb4eb9..00000000000
--- a/devel/scons/patches/patch-setup_cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: setup.cfg
---- setup.cfg.orig
-+++ setup.cfg
-@@ -61,7 +61,7 @@ console_scripts = 
- SCons.Tool.docbook = *.*
- 
- [options.data_files]
--. = scons.1
-+man/man1 = scons.1
- 	scons-time.1
- 	sconsign.1
- 
diff --git a/devel/scons/pkg/PLIST b/devel/scons/pkg/PLIST
index d58e9ef255c..b8dd55b5f0c 100644
--- a/devel/scons/pkg/PLIST
+++ b/devel/scons/pkg/PLIST
@@ -145,6 +145,7 @@ lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/Config.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/Dispatcher.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/Exceptions.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/Kind.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/Policy.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/Registry.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/ScriptArguments.py
@@ -160,6 +161,8 @@ lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACH
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Dispatcher.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Kind.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Kind.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Policy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Policy.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}Registry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -460,7 +463,6 @@ lib/python${MODPY_VERSION}/site-packages/SCons/Tool/dmd.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/${MODPY_PYCACHE}__init__.cpython-311.pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/docbook-xsl-1.76.1/
@@ -1893,38 +1895,38 @@ lib/python${MODPY_VERSION}/site-packages/SCons/Tool/msvs.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/mwcc.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/mwld.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/nasm.py
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/Globals.py
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/Methods.py
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/NinjaState.py
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/Overrides.py
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/Rules.py
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/Utils.py
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Globals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Globals.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Methods.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Methods.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}NinjaState.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}NinjaState.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Overrides.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Overrides.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Rules.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Rules.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}Utils.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}ninja_daemon_build.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}ninja_daemon_build.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}ninja_run_daemon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}ninja_run_daemon.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}ninja_scons_daemon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/${MODPY_PYCACHE}ninja_scons_daemon.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/ninja_daemon_build.py
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/ninja_run_daemon.py
-lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja/ninja_scons_daemon.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/Globals.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/Methods.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/NinjaState.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/Overrides.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/Rules.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/Utils.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}Globals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}Globals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}Methods.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}Methods.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}NinjaState.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}NinjaState.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}Overrides.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}Overrides.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}Rules.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}Rules.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}Utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}Utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}ninja_daemon_build.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}ninja_daemon_build.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}ninja_run_daemon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}ninja_run_daemon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}ninja_scons_daemon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/${MODPY_PYCACHE}ninja_scons_daemon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/ninja_daemon_build.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/ninja_run_daemon.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/ninja_tool/ninja_scons_daemon.py
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/
 lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/packaging/${MODPY_PYCACHE}/
2025-08-17 12:55 Rafael Sadowski:
UPDATE: devel/scons