From: Russell Senior <redacted>
Date: Sun, 10 May 2026 15:36:55 +0000 (-0700)
Subject: scons: recent update failed to update a patch
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=636c12c1247f183ddfbb71623d2daa95b5062b56;p=openwrt-packages.git

scons: recent update failed to update a patch

The recent commit 048a5088c515f737fecfd797807c9dfa6302fc0f updated
scons to 4.10.1, but neglected to correct a version related path in
a patch. This fixes that oversight, so that scons hostpkg builds
again. Also, fix up fuzz in the patches.

Signed-off-by: Russell Senior <redacted>
---

diff --git a/devel/scons/patches/001-platform_env.patch b/devel/scons/patches/001-platform_env.patch
index 641fdc7cf..ba7a1a7fe 100644
--- a/devel/scons/patches/001-platform_env.patch
+++ b/devel/scons/patches/001-platform_env.patch
@@ -1,6 +1,6 @@
---- a/scons-local-4.0.1/SCons/Platform/__init__.py
-+++ b/scons-local-4.0.1/SCons/Platform/__init__.py
-@@ -63,6 +63,8 @@ def platform_default():
+--- a/scons-local-4.10.1/SCons/Platform/__init__.py
++++ b/scons-local-4.10.1/SCons/Platform/__init__.py
+@@ -69,6 +69,8 @@ def platform_default():
      care about the machine architecture.
      """
      osname = os.name
diff --git a/devel/scons/patches/002-fix-import-path.patch b/devel/scons/patches/002-fix-import-path.patch
index 2c72cba1e..bba6ddb14 100644
--- a/devel/scons/patches/002-fix-import-path.patch
+++ b/devel/scons/patches/002-fix-import-path.patch
@@ -1,6 +1,6 @@
 --- a/scons.py
 +++ b/scons.py
-@@ -56,6 +56,7 @@ if script_path in sys.path:
+@@ -57,6 +57,7 @@ if script_path in sys.path:
      sys.path.remove(script_path)
  
  libs = []