From af5255598cf1af9c9c1a726f59af4dda45e070f0 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 13 May 2013 22:53:59 +0200
Subject: [PATCH] <build>linkcatkeys was failing to run on Haiku r1a4
 correctly.

* linking against the host libbe.so which could also contain classes
like DefaultCatalog seems to let the runtime_loader in trouble.
* as a workaround we rename the class.
---
 src/tools/locale/Jamfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/tools/locale/Jamfile b/src/tools/locale/Jamfile
index 1e47eaacc4..f1564b27a4 100644
--- a/src/tools/locale/Jamfile
+++ b/src/tools/locale/Jamfile
@@ -15,6 +15,9 @@ local localetools =
 # Due to the use of STL fstream open() mapping the function names via macro
 # name doesn't work.
 DEFINES += _HAIKU_BUILD_DONT_REMAP_FD_FUNCTIONS ;
+# We link against the host libbe.so which could also contain this class, so
+# rename it for locale tools
+DEFINES += DefaultCatalog=ToolsDefaultCatalog ;
 
 USES_BE_API on $(localetools) = true ;