From 04d1edefe25bfa40ba2360e596189281739bd649 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 2 Apr 2013 17:24:22 +0000
Subject: [PATCH] Fix the libpackage_build build

* The recently introduced {No,Standard}ErrorOutput.cpp were still
  missing.
* 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/build/libpackage/Jamfile | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/build/libpackage/Jamfile b/src/build/libpackage/Jamfile
index 7b7d56f72f..58ce24b42e 100644
--- a/src/build/libpackage/Jamfile
+++ b/src/build/libpackage/Jamfile
@@ -1,6 +1,15 @@
 SubDir HAIKU_TOP src build libpackage ;
 
-UsePrivateBuildHeaders kernel shared ;
+# 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 . ;
+}
+
+UsePrivateBuildHeaders kernel package shared ;
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package ] ;
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package hpkg ] ;
@@ -84,6 +93,11 @@ BuildPlatformSharedLibrary libpackage_build.so
 	ValidateChecksumJob.cpp
 
 	$(HPKG_SOURCES)
+
+	# hpkg, but only libpackage
+	NoErrorOutput.cpp
+	StandardErrorOutput.cpp
+
 	:
 	libshared_build.a $(HOST_LIBBE) z $(HOST_LIBSTDC++)
 ;