i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed build under Linux. Also tested on BeOS. Fixes bug #983.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19991 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Waldemar Kornewald
2007-01-28 12:33:12 +00:00
parent ad13bfbbd7
commit 35f71eb445
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/docbook/libxml2/Jamfile
+16 -2
View File
@@ -3,7 +3,21 @@ SubDir HAIKU_TOP src tools docbook libxml2 ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
# defines # 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) ; SubDirCcFlags $(defines) ;
SubDirC++Flags $(defines) ; SubDirC++Flags $(defines) ;
@@ -62,4 +76,4 @@ BuildPlatformMain <build>xmllint :
; ;
LinkAgainst <build>xmllint LinkAgainst <build>xmllint
: <build>libxml2.a net z ; : <build>libxml2.a $(osLibs) z ;
src/tools/docbook/libxslt/Jamfile
+9 -1
View File
@@ -20,6 +20,14 @@ for sourceDir in $(sourceDirs) {
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src tools docbook libxslt $(sourceDir) ] ; 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 # system headers
SubDirSysHdrs [ FDirName $(HAIKU_TOP) src tools docbook libxml2 include ] ; SubDirSysHdrs [ FDirName $(HAIKU_TOP) src tools docbook libxml2 include ] ;
SubDirSysHdrs [ FDirName $(HAIKU_TOP) src tools docbook libxslt ] ; SubDirSysHdrs [ FDirName $(HAIKU_TOP) src tools docbook libxslt ] ;
@@ -62,4 +70,4 @@ BuildPlatformMain <build>xsltproc :
; ;
LinkAgainst <build>xsltproc LinkAgainst <build>xsltproc
: <build>libxslt.a <build>libxml2.a net z ; : <build>libxslt.a <build>libxml2.a $(osLibs) z ;