From 2e61b6dd1dfa06f67a1786a8d1b146206c053646 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sun, 2 Mar 2014 10:45:50 +0100
Subject: [PATCH] Adjust libnetwork.so to no longer depend on libbe.so.

* Libbe is not available when cross-building the *_bootstrap packages,
  so no libnetwork could not be used either, which made building
  anything network-related impossible.
* The only code in libnetwork that requires libbe is the notification,
  so I moved that over to libbnetapi. Non-C++ applications can't use
  the notification calls anyway, as their interface is C++-only.
---
 src/kits/network/Jamfile                           | 4 +---
 src/kits/network/libnetapi/Jamfile                 | 6 +++++-
 src/kits/network/{ => libnetapi}/notifications.cpp | 0
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename src/kits/network/{ => libnetapi}/notifications.cpp (100%)

diff --git a/src/kits/network/Jamfile b/src/kits/network/Jamfile
index 87cb5a8a1f..6725088f97 100644
--- a/src/kits/network/Jamfile
+++ b/src/kits/network/Jamfile
@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src kits network ;
 
-UsePrivateHeaders app libroot net shared ;
+UsePrivateHeaders libroot net shared ;
 
 local services = [ FGristFiles services ] ;
 SEARCH on $(services) = [ FDirName $(SUBDIR) libbind defaults ] ;
@@ -16,11 +16,9 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 		SharedLibrary $(libnetwork) :
 			init.cpp
 			interfaces.cpp
-			notifications.cpp
 			socket.cpp
 			r5_compatibility.cpp
 			:
-			be
 			<libbind!$(architecture)>libbind.o
 			$(TARGET_LIBSUPC++)
 			;
diff --git a/src/kits/network/libnetapi/Jamfile b/src/kits/network/libnetapi/Jamfile
index 9831f65f10..4acec98e4f 100644
--- a/src/kits/network/libnetapi/Jamfile
+++ b/src/kits/network/libnetapi/Jamfile
@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src kits network libnetapi ;
 
-UsePrivateHeaders net shared ;
+UsePrivateHeaders app net shared ;
 
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
 	: true ;
@@ -17,6 +17,8 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 		Includes [ FGristFiles $(HPKG_SOURCES) ]
 			: [ BuildFeatureAttribute zlib : headers ] ;
 
+		UsePrivateSystemHeaders ;
+
 		if [ FIsBuildFeatureEnabled openssl ] {
 			SubDirC++Flags -DOPENSSL_ENABLED ;
 			UseBuildFeatureHeaders openssl ;
@@ -73,6 +75,8 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			# TODO: another add-on for file:// (a much simpler one)
 			FileRequest.cpp
 
+			notifications.cpp
+
 			$(md5Sources)
 
 			Url.cpp
diff --git a/src/kits/network/notifications.cpp b/src/kits/network/libnetapi/notifications.cpp
similarity index 100%
rename from src/kits/network/notifications.cpp
rename to src/kits/network/libnetapi/notifications.cpp