From 938bf9fad2fa70a2fd7dba661464068133bf9b73 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Thu, 31 Jul 2014 18:34:37 +0200
Subject: [PATCH] Add more missing 'local's to variable declarations.

---
 build/jam/ConfigRules             | 2 ++
 build/jam/ImageRules              | 1 +
 build/jam/MathRules               | 1 +
 build/jam/RepositoryRules         | 1 +
 build/jam/packages/Haiku          | 2 ++
 build/jam/packages/HaikuBootstrap | 2 ++
 6 files changed, 9 insertions(+)

diff --git a/build/jam/ConfigRules b/build/jam/ConfigRules
index 513048dcd3..10a4c7eb06 100644
--- a/build/jam/ConfigRules
+++ b/build/jam/ConfigRules
@@ -128,6 +128,7 @@ rule PrepareSubDirConfigVariables
 			: __inherited_config__ ] ;
 
 		on [ ConfigObject $(parentDir) : __inherited_config__ ] {
+			local var ;
 			for var in $(AUTO_SET_UP_CONFIG_VARIABLES) {
 				$(var) on $(config) ?= $($(var)) ;
 				$(var) on $(inheritedConfig) ?= $($(var)) ;
@@ -147,6 +148,7 @@ rule PrepareConfigVariables
 	local rootConfig = [ ConfigObject ] ; # the root config object
 	local inheritedRootConfig = [ ConfigObject : __inherited_config__ ] ;
 
+	local var ;
 	for var in $(AUTO_SET_UP_CONFIG_VARIABLES) {
 		$(var) on $(rootConfig) = $($(var)) ;
 		$(var) on $(inheritedRootConfig) = $($(var)) ;
diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index 6f7ad8c338..4580f18d04 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -488,6 +488,7 @@ rule AddDriversToContainer container : relativeDirectoryTokens : targets
 
 	# get the relative symlink path prefix
 	local linkPrefix = ;
+	local i ;
 	for i in $(relativeDirectoryTokens) {
 		linkPrefix += .. ;
 	}
diff --git a/build/jam/MathRules b/build/jam/MathRules
index 5bae0c12d3..10f006c807 100644
--- a/build/jam/MathRules
+++ b/build/jam/MathRules
@@ -584,6 +584,7 @@ rule Expr expression
 
 	# tokenize the expression
 	local tokens ;
+	local string ;
 	for string in $(expression) {
 		while $(string) {
 			local split = [ Match "[ \t]*(-|[()+*]|[0-9]*)(.*)" : $(string) ] ;
diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules
index c2fba17ac9..3647d8fc1f 100644
--- a/build/jam/RepositoryRules
+++ b/build/jam/RepositoryRules
@@ -184,6 +184,7 @@ rule RemotePackageRepository repository : architecture : repositoryUrl
 			on $(packageListFile) return $(HAIKU_REPOSITORY_PACKAGE_FILE_NAMES)
 		] ;
 		local packageFiles ;
+		local packageFile ;
 		for packageFile in $(packageFileNames) {
 			MakeLocate $(packageFile) : $(HAIKU_DOWNLOAD_DIR) ;
 			packageFiles += $(packageFile) ;
diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index 72f52ab618..69fb6133a2 100644
--- a/build/jam/packages/Haiku
+++ b/build/jam/packages/Haiku
@@ -6,6 +6,7 @@ HaikuPackage $(haikuPackage) ;
 
 
 # wifi firmware
+local driver ;
 for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
 	local package = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_PACKAGE) ] ;
 	local archive = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVE) ] ;
@@ -16,6 +17,7 @@ for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
 	}
 	local packages = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_PACKAGES) ] ;
 	local archives = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVES) ] ;
+	local archive ;
 	for archive in $(archives) {
 		AddWifiFirmwareToPackage $(driver) : $(packages[1]) : $(archive)
 			: $(extract) ;
diff --git a/build/jam/packages/HaikuBootstrap b/build/jam/packages/HaikuBootstrap
index afe4f8ca5d..bc07ea7fbc 100644
--- a/build/jam/packages/HaikuBootstrap
+++ b/build/jam/packages/HaikuBootstrap
@@ -6,6 +6,7 @@ HaikuPackage $(haikuPackage) ;
 
 
 # wifi firmware
+local driver ;
 for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
 	local package = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_PACKAGE) ] ;
 	local archive = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVE) ] ;
@@ -16,6 +17,7 @@ for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
 	}
 	local packages = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_PACKAGES) ] ;
 	local archives = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVES) ] ;
+	local archive ;
 	for archive in $(archives) {
 		AddWifiFirmwareToPackage $(driver) : $(packages[1]) : $(archive)
 			: $(extract) ;