From fc75f2df0c666dcc61be83c4facdd3132340c2fb Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 2 Apr 2013 17:27:29 +0000
Subject: [PATCH] <build>package: Fix build

* StandardErrorOutput.cpp no longer exists (respectively has been moved
  to libpackage).
* Add hack to allow building more correctly on Haiku. We were using
  the installed package kit headers, not the ones from the working
  directory.
---
 src/tools/package/Jamfile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/tools/package/Jamfile b/src/tools/package/Jamfile
index 2609ede7ad..8c72d378fa 100644
--- a/src/tools/package/Jamfile
+++ b/src/tools/package/Jamfile
@@ -1,5 +1,13 @@
 SubDir HAIKU_TOP src tools package ;
 
+# TODO: Hack to make things build on Haiku. The right solution is to build
+# libbe_build and friends on Haiku as well and use the exact same build
+# environment as on other systems.
+if $(HOST_PLATFORM) = haiku_host {
+	UseHeaders [ FDirName $(HAIKU_TOP) headers build ] : true ;
+	UseHeaders [ FDirName $(HAIKU_TOP) headers build os ] : true ;
+}
+
 UsePrivateBuildHeaders shared kernel ;
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src bin package ] ;
@@ -15,7 +23,6 @@ BuildPlatformMain <build>package :
 	package.cpp
 	PackageWriterListener.cpp
 	PackageWritingUtils.cpp
-	StandardErrorOutput.cpp
 
 	:
 	libpackage_build.so $(HOST_LIBBE) $(HOST_LIBSUPC++)