From 5b012f80189704f2b0df89a7a183615dff30bb1b Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 28 Apr 2020 10:16:35 +0200
Subject: [PATCH] scons: handle secondary arch in chroot

---
 dev-util/scons/patches/scons-3.1.2.patchset | 23 ++++++++++++---------
 dev-util/scons/scons-3.1.2.recipe           |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/dev-util/scons/patches/scons-3.1.2.patchset b/dev-util/scons/patches/scons-3.1.2.patchset
index d28705be5..906b52b1a 100644
--- a/dev-util/scons/patches/scons-3.1.2.patchset
+++ b/dev-util/scons/patches/scons-3.1.2.patchset
@@ -1,4 +1,4 @@
-From 0264df7ae6bd79b5cd9d085e6620e0c5df18f380 Mon Sep 17 00:00:00 2001
+From 3609030bdb0666a1d4e2e06508d03948345c0450 Mon Sep 17 00:00:00 2001
 From: Ingo Weinhold <ingo_weinhold@gmx.de>
 Date: Fri, 9 Aug 2013 17:46:35 +0200
 Subject: Add support for the Haiku platform
@@ -95,7 +95,7 @@ index 7d959b7..1ca4685 100644
 2.24.0
 
 
-From c2fd03dd3c66bed1385673c8aa606a6ca57f6f1d Mon Sep 17 00:00:00 2001
+From 22a5f208e276e2f87cb6a4ff899c782563b1c12b Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 22 Jan 2020 22:35:19 +0100
 Subject: python3 support
@@ -125,7 +125,7 @@ index 547421e..dd83ef8 100644
 2.24.0
 
 
-From 795c3605dfdfe35ee676f8bff95b84e1877501ca Mon Sep 17 00:00:00 2001
+From c5c4b805b0096616b58889066a0d36f07a089bd1 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Mon, 27 Apr 2020 14:05:11 +0200
 Subject: move platform haiku file
@@ -139,7 +139,7 @@ rename to src/engine/SCons/Platform/haiku.py
 2.24.0
 
 
-From 6847e9d379bcab1af573378a5d30ae22605573d5 Mon Sep 17 00:00:00 2001
+From 59619e1319ef38b81daf9be13642fbec1a7a7925 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Mon, 27 Apr 2020 14:05:11 +0200
 Subject: move platform haiku file
@@ -158,20 +158,23 @@ index 3125824..231d3fc 100644
  SCons/Platform/irix.py
  SCons/Platform/os2.py
 diff --git a/src/engine/SCons/Platform/haiku.py b/src/engine/SCons/Platform/haiku.py
-index dd83ef8..ced6116 100644
+index 80d3b06..b9cd656 100644
 --- a/src/engine/SCons/Platform/haiku.py
 +++ b/src/engine/SCons/Platform/haiku.py
-@@ -65,4 +65,4 @@ def generate(env):
+@@ -61,6 +61,8 @@ def generate(env):
+ 			path += '/' + subDir
+ 		paths.append(path)
+ 
++	paths.append('/bin')
++
+ 	if secondaryArch:
  		# prepend the secondary arch subdirectories
  		paths = [path + archSubDir for path in paths] + paths
- 
--	env['ENV']['PATH'] = ':'.join(paths)
-+	env['ENV']['PATH'] = ':'.join(paths) + ":/bin"
 -- 
 2.24.0
 
 
-From 7b6b4633337e71b5bc409dc445546e69a1655c1d Mon Sep 17 00:00:00 2001
+From b8f691d4e2685e443f9604ac548afae2e72e1910 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Mon, 27 Apr 2020 21:28:15 +0200
 Subject: Haiku: add LIBRARY_PATH handling
diff --git a/dev-util/scons/scons-3.1.2.recipe b/dev-util/scons/scons-3.1.2.recipe
index fb8cdcc7f..369fd401d 100644
--- a/dev-util/scons/scons-3.1.2.recipe
+++ b/dev-util/scons/scons-3.1.2.recipe
@@ -7,7 +7,7 @@ an easier, more reliable and faster way to build software."
 HOMEPAGE="https://www.scons.org/"
 COPYRIGHT="2001-2019 The SCons Foundation"
 LICENSE="MIT"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://github.com/scons/scons/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="6458e0beee0876fa3455b50223f97c54e0546317f8a5e9753acd89e6a5a20f3d"
 SOURCE_FILENAME="scons-$portVersion.tar.gz"