Ticket #983: doctools.2.diff

src/tools/docbook/libxslt/Jamfile

@@ -20 +20 @@
     SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src tools docbook libxslt $(sourceDir) ] ;
 }
 
+local osLibs ;
+# use different libaries depending on host platform
+if $(HOST_PLATFORM) in $(HAIKU_BEOS_COMPATIBLE_PLATFORMS) {
+    osLibs = net ;
+} else {
+    osLibs = "m" ;
+}
+
 # system headers
 SubDirSysHdrs [ FDirName $(HAIKU_TOP) src tools docbook libxml2 include ] ;
 SubDirSysHdrs [ FDirName $(HAIKU_TOP) src tools docbook libxslt ] ;
@@ -62 +70 @@
 ;
 
 LinkAgainst <build>xsltproc
-    : <build>libxslt.a <build>libxml2.a net z ;
+    : <build>libxslt.a <build>libxml2.a $(osLibs) z ;

src/tools/docbook/libxml2/Jamfile

@@ -3 +3 @@
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
 # defines
-local defines = [ FDefines HAVE_CONFIG_H=1 HAVE_BEOS_THREADS _REENTRANT ] ;
+local defines ;
+if $(HOST_PLATFORM) in $(HAIKU_BEOS_COMPATIBLE_PLATFORMS) {
+    defines = [ FDefines HAVE_CONFIG_H=1 HAVE_BEOS_THREADS _REENTRANT ] ;
+} else {
+    # Assumes non-BeOS host platforms have pthread support
+    defines = [ FDefines HAVE_CONFIG_H=1 HAVE_PTHREAD_H _REENTRANT ] ;
+}
 
+# use different libaries depending on host platform
+local osLibs ;
+if $(HOST_PLATFORM) in $(HAIKU_BEOS_COMPATIBLE_PLATFORMS) {
+    osLibs = net ;
+} else {
+    osLibs = m ;
+}
+
 SubDirCcFlags $(defines) ;
 SubDirC++Flags $(defines) ;
 
@@ -62 +76 @@
 ;
 
 LinkAgainst <build>xmllint
-    : <build>libxml2.a net z ;
- No newline at end of file
+    : <build>libxml2.a $(osLibs) z ;