From 7115cef98944c1bd53960441894010b1f60811b9 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Mon, 13 May 2019 19:19:28 -0400
Subject: [PATCH] Jamrules: Include the UserBuildConfig before processing
 repositories.

Repository processing triggers HAIKU_REVISION computation, and it
is intended that the UserBuildConfig can override or set HAIKU_REVISION.

Fixes #14834.
---
 Jamrules | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/Jamrules b/Jamrules
index f242565d9c..878baa93da 100644
--- a/Jamrules
+++ b/Jamrules
@@ -93,25 +93,6 @@ include [ FDirName $(HAIKU_BUILD_RULES_DIR) TestsRules ] ;
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) BuildSetup ] ;
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) DefaultBuildProfiles ] ;
 
-# Include the repositories for this architecture.
-local repositoriesDirectory
-	= [ FDirName $(HAIKU_BUILD_RULES_DIR) repositories ] ;
-local repositories = HaikuPorts ;
-if $(HAIKU_BUILD_TYPE) = bootstrap {
-	repositories = HaikuPortsCross ;
-}
-
-local repository ;
-for repository in $(repositories) {
-	local repositoryDirectory
-		= [ FDirName $(repositoriesDirectory) $(repository) ] ;
-	local file = [ Glob $(repositoryDirectory) : $(HAIKU_PACKAGING_ARCH) ] ;
-	if $(file) {
-		HAIKU_REPOSITORY_JAMFILE = $(file) ;
-		include $(file) ;
-	}
-}
-
 # Declare no-op user-overridable build rules.
 rule UserBuildConfigRulePostBuildTargets	{ }
 rule UserBuildConfigRulePreImage			{ }
@@ -133,6 +114,25 @@ if ! $(HAIKU_IGNORE_USER_BUILD_CONFIG) {
 	}
 }
 
+# Include the repositories for this architecture.
+local repositoriesDirectory
+	= [ FDirName $(HAIKU_BUILD_RULES_DIR) repositories ] ;
+local repositories = HaikuPorts ;
+if $(HAIKU_BUILD_TYPE) = bootstrap {
+	repositories = HaikuPortsCross ;
+}
+
+local repository ;
+for repository in $(repositories) {
+	local repositoryDirectory
+		= [ FDirName $(repositoriesDirectory) $(repository) ] ;
+	local file = [ Glob $(repositoryDirectory) : $(HAIKU_PACKAGING_ARCH) ] ;
+	if $(file) {
+		HAIKU_REPOSITORY_JAMFILE = $(file) ;
+		include $(file) ;
+	}
+}
+
 DefineDefaultBuildProfiles ;
 
 PrepareConfigVariables ;