From 35f71eb4456dee2b7c80c4c2b4afb34932e0802f Mon Sep 17 00:00:00 2001 From: Waldemar Kornewald Date: Sun, 28 Jan 2007 12:33:12 +0000 Subject: [PATCH] Fixed build under Linux. Also tested on BeOS. Fixes bug #983. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19991 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tools/docbook/libxml2/Jamfile | 18 ++++++++++++++++-- src/tools/docbook/libxslt/Jamfile | 10 +++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/tools/docbook/libxml2/Jamfile b/src/tools/docbook/libxml2/Jamfile index 6f8c194613..47354a669f 100644 --- a/src/tools/docbook/libxml2/Jamfile +++ b/src/tools/docbook/libxml2/Jamfile @@ -3,7 +3,21 @@ SubDir HAIKU_TOP src tools docbook libxml2 ; 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,4 +76,4 @@ BuildPlatformMain xmllint : ; LinkAgainst xmllint - : libxml2.a net z ; \ No newline at end of file + : libxml2.a $(osLibs) z ; diff --git a/src/tools/docbook/libxslt/Jamfile b/src/tools/docbook/libxslt/Jamfile index 7f31c3ea8d..15c2a21479 100644 --- a/src/tools/docbook/libxslt/Jamfile +++ b/src/tools/docbook/libxslt/Jamfile @@ -20,6 +20,14 @@ for sourceDir in $(sourceDirs) { SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src tools docbook libxslt $(sourceDir) ] ; } +# use different libaries depending on host platform +local osLibs ; +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,4 +70,4 @@ BuildPlatformMain xsltproc : ; LinkAgainst xsltproc - : libxslt.a libxml2.a net z ; + : libxslt.a libxml2.a $(osLibs) z ;