From da0f9ae040921d1af3cdbac209bdf16fe80f95b3 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 2 Aug 2007 21:13:56 +0000 Subject: [PATCH] Added Haiku as host platform supported by the build system ("haiku_host"). Completely untested yet. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21802 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/BuildSetup | 15 +++++++++------ build/jam/HelperRules | 17 +++++++++++++---- build/jam/KernelRules | 4 ++++ configure | 5 +++-- .../kernel/drivers/graphics/vmware/Jamfile | 2 +- .../kernel/drivers/input/usb_hid/Jamfile | 2 +- .../kernel/drivers/network/stack/Jamfile | 2 +- .../media/media-add-ons/esound_sink/Jamfile | 2 +- .../media/media-add-ons/multi_audio/Jamfile | 2 +- .../media/media-add-ons/usb_webcam/Jamfile | 2 +- src/apps/networkstatus/Jamfile | 2 +- src/apps/pulse/Jamfile | 2 +- src/apps/resedit/Jamfile | 2 +- src/apps/stylededit/Jamfile | 2 +- src/bin/bash/lib/glob/Jamfile | 2 +- src/bin/bash/lib/readline/Jamfile | 2 +- src/bin/bash/lib/sh/Jamfile | 2 +- src/bin/desklink/Jamfile | 2 +- src/bin/network/arp/Jamfile | 2 +- src/bin/network/ftp/Jamfile | 2 +- src/bin/network/ifconfig/Jamfile | 2 +- src/bin/network/nc/Jamfile | 2 +- src/bin/network/ping/Jamfile | 2 +- src/bin/network/ppp_up/Jamfile | 2 +- src/bin/network/pppconfig/Jamfile | 2 +- src/bin/network/route/Jamfile | 2 +- src/bin/network/traceroute/Jamfile | 2 +- src/bin/pcmcia-cs/Jamfile | 8 ++++---- src/kits/support/Jamfile | 6 ------ src/kits/textencoding/Jamfile | 2 +- src/kits/textencoding/libiconv/Jamfile | 2 +- src/kits/tracker/Jamfile | 2 +- src/preferences/keyboard/Jamfile | 2 +- src/preferences/media/Jamfile | 2 +- src/preferences/sounds/Jamfile | 2 +- src/preferences/virtualmemory/Jamfile | 4 ++-- src/tools/bfs_shell/Jamfile | 2 +- 37 files changed, 65 insertions(+), 54 deletions(-) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index 4cba5bb055..365f26ba29 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -95,9 +95,10 @@ if $(JAM_TARGETS) { HAIKU_DEBUG_LEVELS = 0 1 2 3 4 5 ; # BeOS, BONE, Dan0 compatible platforms -HAIKU_BEOS_COMPATIBLE_PLATFORMS = haiku r5 bone dano ; -HAIKU_BONE_COMPATIBLE_PLATFORMS = haiku bone dano ; -HAIKU_DANO_COMPATIBLE_PLATFORMS = haiku dano ; +HAIKU_BEOS_COMPATIBLE_PLATFORMS = haiku r5 bone dano haiku_host ; +HAIKU_BONE_COMPATIBLE_PLATFORMS = haiku bone dano haiku_host ; +HAIKU_DANO_COMPATIBLE_PLATFORMS = haiku dano haiku_host ; +HAIKU_HAIKU_COMPATIBLE_PLATFORMS = haiku haiku_host ; #pragma mark - @@ -436,6 +437,7 @@ HOST_KERNEL_WARNING_C++FLAGS = -Wall ; # debug flags switch $(HOST_PLATFORM) { case haiku : HOST_DEBUG_FLAGS ?= -ggdb ; + case haiku_host : HOST_DEBUG_FLAGS ?= -ggdb ; case linux : HOST_DEBUG_FLAGS ?= -ggdb ; case freebsd : HOST_DEBUG_FLAGS ?= -ggdb ; case darwin : HOST_DEBUG_FLAGS ?= -ggdb ; @@ -582,7 +584,7 @@ if $(TARGET_PLATFORM) != haiku { } # TODO: Fix the naming! -if $(TARGET_PLATFORM) = haiku { +if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { NETWORK_LIBS = network ; SELECT_UNAME_ETC_LIB = root ; NETAPI_LIB = network ; @@ -674,6 +676,7 @@ switch $(TARGET_PLATFORM) { case r5 : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_BEOS ; case bone : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_BONE ; case dano : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_DANO ; + case haiku_host : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_HAIKU ; case haiku : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_HAIKU ; case linux : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_LINUX ; case freebsd : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_FREEBSD ; @@ -686,7 +689,7 @@ switch $(HOST_PLATFORM) { case r5 : HOST_DEFINES += HAIKU_HOST_PLATFORM_BEOS ; case bone : HOST_DEFINES += HAIKU_HOST_PLATFORM_BONE ; case dano : HOST_DEFINES += HAIKU_HOST_PLATFORM_DANO ; - case haiku : HOST_DEFINES += HAIKU_HOST_PLATFORM_HAIKU ; + case haiku_host : HOST_DEFINES += HAIKU_HOST_PLATFORM_HAIKU ; case linux : HOST_DEFINES += HAIKU_HOST_PLATFORM_LINUX ; case freebsd : HOST_DEFINES += HAIKU_HOST_PLATFORM_FREEBSD ; case darwin : HOST_DEFINES += HAIKU_HOST_PLATFORM_DARWIN ; @@ -699,7 +702,7 @@ switch $(HOST_PLATFORM) { # include the HaikuBuildCompatibility.h header and link against # libhaikucompat.a. -if $(TARGET_PLATFORM) != haiku && $(TARGET_PLATFORM_BEOS_COMPATIBLE) { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) && $(TARGET_PLATFORM_BEOS_COMPATIBLE) { # headers and flags local compatibilityHeader = -include [ FDirName $(HAIKU_TOP) headers build HaikuBuildCompatibility.h ] ; diff --git a/build/jam/HelperRules b/build/jam/HelperRules index d2ace6708d..3a66b1a16b 100644 --- a/build/jam/HelperRules +++ b/build/jam/HelperRules @@ -156,22 +156,27 @@ rule SetPlatformCompatibilityFlagVariables { $(varPrefix)_PLATFORM_BEOS_COMPATIBLE = true ; } - + case bone : { $(varPrefix)_PLATFORM_BONE_COMPATIBLE = true ; } - + case dano : { $(varPrefix)_PLATFORM_DANO_COMPATIBLE = true ; } - + + case haiku_host : + { + $(varPrefix)_PLATFORM_HAIKU_COMPATIBLE = true ; + } + case haiku : { $(varPrefix)_PLATFORM_HAIKU_COMPATIBLE = true ; } - + case * : { if ! ( $(platform) in $(otherPlatforms) ) { @@ -181,6 +186,8 @@ rule SetPlatformCompatibilityFlagVariables } # set lesser flags, e.g. "DANO" for "HAIKU" and "BEOS" for "BONE" + $(varPrefix)_PLATFORM_HAIKU_COMPATIBLE + ?= $($(varPrefix)_PLATFORM_HAIKU_COMPATIBLE) ; $(varPrefix)_PLATFORM_DANO_COMPATIBLE ?= $($(varPrefix)_PLATFORM_HAIKU_COMPATIBLE) ; $(varPrefix)_PLATFORM_BONE_COMPATIBLE @@ -191,6 +198,8 @@ rule SetPlatformCompatibilityFlagVariables # set the machine friendly flags $(varPrefix)_PLATFORM_(haiku)_COMPATIBLE ?= $($(varPrefix)_PLATFORM_HAIKU_COMPATIBLE) ; + $(varPrefix)_PLATFORM_(haiku_host)_COMPATIBLE + ?= $($(varPrefix)_PLATFORM_HAIKU_COMPATIBLE) ; $(varPrefix)_PLATFORM_(dano)_COMPATIBLE ?= $($(varPrefix)_PLATFORM_DANO_COMPATIBLE) ; $(varPrefix)_PLATFORM_(bone)_COMPATIBLE diff --git a/build/jam/KernelRules b/build/jam/KernelRules index a86a0f135c..001fb6f94d 100644 --- a/build/jam/KernelRules +++ b/build/jam/KernelRules @@ -93,6 +93,10 @@ rule KernelAddon kernel = kernel.so ; beginGlue = $(HAIKU_KERNEL_ADDON_BEGIN_GLUE_CODE) ; endGlue = $(HAIKU_KERNEL_ADDON_END_GLUE_CODE) ; + } else if $(PLATFORM) = haiku_host { + kernel = /boot/develop/lib/x86/kernel.so ; + beginGlue = $(HAIKU_KERNEL_ADDON_BEGIN_GLUE_CODE) ; + endGlue = $(HAIKU_KERNEL_ADDON_END_GLUE_CODE) ; } else { kernel = /boot/develop/lib/x86/_KERNEL_ ; } diff --git a/configure b/configure index cc2a3e658e..332ddeca6c 100755 --- a/configure +++ b/configure @@ -290,9 +290,10 @@ case "${platform}" in exit 1 ;; esac ;; - Linux) buildPlatform=linux ;; - FreeBSD) buildPlatform=freebsd ;; Darwin) buildPlatform=darwin ;; + FreeBSD) buildPlatform=freebsd ;; + Haiku) buildPlatform=haiku_host ;; + Linux) buildPlatform=linux ;; *) echo Unsupported platform: ${platform} exit 1 ;; esac diff --git a/src/add-ons/kernel/drivers/graphics/vmware/Jamfile b/src/add-ons/kernel/drivers/graphics/vmware/Jamfile index 243dbd988f..0158265bfe 100644 --- a/src/add-ons/kernel/drivers/graphics/vmware/Jamfile +++ b/src/add-ons/kernel/drivers/graphics/vmware/Jamfile @@ -11,7 +11,7 @@ KernelAddon vmware : device.c ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { LinkAgainst vmware : $(TARGET_HAIKU_COMPATIBILITY_LIBS) ; } diff --git a/src/add-ons/kernel/drivers/input/usb_hid/Jamfile b/src/add-ons/kernel/drivers/input/usb_hid/Jamfile index 65e126ac00..e44bcf7d08 100644 --- a/src/add-ons/kernel/drivers/input/usb_hid/Jamfile +++ b/src/add-ons/kernel/drivers/input/usb_hid/Jamfile @@ -6,7 +6,7 @@ SubDirSysHdrs $(HAIKU_TOP) headers os drivers ; UsePrivateHeaders [ FDirName kernel util ] input ; local buffer_impl = ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { buffer_impl = ring_buffer.cpp ; } diff --git a/src/add-ons/kernel/drivers/network/stack/Jamfile b/src/add-ons/kernel/drivers/network/stack/Jamfile index 5cc1d408e9..9c45ad0dc6 100644 --- a/src/add-ons/kernel/drivers/network/stack/Jamfile +++ b/src/add-ons/kernel/drivers/network/stack/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers network stack ; SetSubDirSupportedPlatformsBeOSCompatible ; -if ( $(TARGET_PLATFORM) != haiku ) { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { UseHeaders [ FStandardOSHeaders ] : true ; # Needed for and maybe other stuff. UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; diff --git a/src/add-ons/media/media-add-ons/esound_sink/Jamfile b/src/add-ons/media/media-add-ons/esound_sink/Jamfile index 880315fefc..ac80e92eca 100644 --- a/src/add-ons/media/media-add-ons/esound_sink/Jamfile +++ b/src/add-ons/media/media-add-ons/esound_sink/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons media media-add-ons esound_sink ; SetSubDirSupportedPlatformsBeOSCompatible ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { SubDirC++Flags -fmultiple-symbol-spaces ; } diff --git a/src/add-ons/media/media-add-ons/multi_audio/Jamfile b/src/add-ons/media/media-add-ons/multi_audio/Jamfile index 9fb30ba763..b8a06a95bf 100644 --- a/src/add-ons/media/media-add-ons/multi_audio/Jamfile +++ b/src/add-ons/media/media-add-ons/multi_audio/Jamfile @@ -4,7 +4,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders media ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { SubDirC++Flags -fmultiple-symbol-spaces ; } diff --git a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile index 7cf662c530..a4b9e532b9 100644 --- a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile +++ b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile @@ -6,7 +6,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UseLibraryHeaders usb ; # Zeta has a libusb.so, we have a USBKit.a -if $(TARGET_PLATFORM) = haiku { +if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { usbKitLibraryName = USBKit.a ; } else { usbKitLibraryName = usb ; diff --git a/src/apps/networkstatus/Jamfile b/src/apps/networkstatus/Jamfile index b0fb960fa7..fd396fdd3e 100644 --- a/src/apps/networkstatus/Jamfile +++ b/src/apps/networkstatus/Jamfile @@ -6,7 +6,7 @@ UsePrivateHeaders shared ; UseLibraryHeaders agg icon ; local icon_libs ; -if $(TARGET) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { icon_libs = libicon.a libagg.a ; } diff --git a/src/apps/pulse/Jamfile b/src/apps/pulse/Jamfile index 204b73532c..64e29bf5d7 100644 --- a/src/apps/pulse/Jamfile +++ b/src/apps/pulse/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src apps pulse ; SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders shared ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { UseHeaders [ FDirName $(HAIKU_TOP) headers os kernel ] : true ; } diff --git a/src/apps/resedit/Jamfile b/src/apps/resedit/Jamfile index 4d1b4c183d..c7cd9c26fd 100644 --- a/src/apps/resedit/Jamfile +++ b/src/apps/resedit/Jamfile @@ -6,7 +6,7 @@ UsePrivateHeaders shared interface ; local columnViewSources ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { columnViewSources = ColumnListView.cpp ColumnTypes.cpp ColorTools.cpp ; } diff --git a/src/apps/stylededit/Jamfile b/src/apps/stylededit/Jamfile index fab039f16f..bd084a6b95 100644 --- a/src/apps/stylededit/Jamfile +++ b/src/apps/stylededit/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src apps stylededit ; SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders textencoding ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { UseHeaders [ FDirName $(HAIKU_TOP) headers os support ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; } diff --git a/src/bin/bash/lib/glob/Jamfile b/src/bin/bash/lib/glob/Jamfile index c66a118f54..befa0de79e 100644 --- a/src/bin/bash/lib/glob/Jamfile +++ b/src/bin/bash/lib/glob/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src bin bash lib glob ; SetSubDirSupportedPlatformsBeOSCompatible ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; } diff --git a/src/bin/bash/lib/readline/Jamfile b/src/bin/bash/lib/readline/Jamfile index edd8c02393..116ba7f07c 100644 --- a/src/bin/bash/lib/readline/Jamfile +++ b/src/bin/bash/lib/readline/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src bin bash lib readline ; SetSubDirSupportedPlatformsBeOSCompatible ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; } diff --git a/src/bin/bash/lib/sh/Jamfile b/src/bin/bash/lib/sh/Jamfile index d81cea06f7..c581434423 100644 --- a/src/bin/bash/lib/sh/Jamfile +++ b/src/bin/bash/lib/sh/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src bin bash lib sh ; SetSubDirSupportedPlatformsBeOSCompatible ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; } diff --git a/src/bin/desklink/Jamfile b/src/bin/desklink/Jamfile index c261961f28..723e3ba727 100644 --- a/src/bin/desklink/Jamfile +++ b/src/bin/desklink/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src bin desklink ; SetSubDirSupportedPlatformsBeOSCompatible ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { UseHeaders [ FDirName $(HAIKU_TOP) headers os interface ] : true ; # We need the public interface headers also when not compiling for Haiku. UseHeaders [ FDirName $(HAIKU_TOP) headers os ] : true ; diff --git a/src/bin/network/arp/Jamfile b/src/bin/network/arp/Jamfile index 5fb71b5735..d9619706c1 100644 --- a/src/bin/network/arp/Jamfile +++ b/src/bin/network/arp/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src bin network arp ; SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; # We need the public network headers also when not compiling for Haiku. # Unfortunately we get more than we want, namely all POSIX headers. diff --git a/src/bin/network/ftp/Jamfile b/src/bin/network/ftp/Jamfile index dcef6e6e89..17e94a5084 100644 --- a/src/bin/network/ftp/Jamfile +++ b/src/bin/network/ftp/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src bin network ftp ; SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; # We need the public network headers also when not compiling for Haiku. # Unfortunately we get more than we want, namely all POSIX headers. diff --git a/src/bin/network/ifconfig/Jamfile b/src/bin/network/ifconfig/Jamfile index 9248a374d9..c0890f13e2 100644 --- a/src/bin/network/ifconfig/Jamfile +++ b/src/bin/network/ifconfig/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src bin network ifconfig ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; # We need the public network headers also when not compiling for Haiku. # Unfortunately we get more than we want, namely all POSIX headers. diff --git a/src/bin/network/nc/Jamfile b/src/bin/network/nc/Jamfile index 8dea9fc4d8..13099be6ea 100644 --- a/src/bin/network/nc/Jamfile +++ b/src/bin/network/nc/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src bin network nc ; SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; # We need the public network headers also when not compiling for Haiku. # Unfortunately we get more than we want, namely all POSIX headers. diff --git a/src/bin/network/ping/Jamfile b/src/bin/network/ping/Jamfile index 9c8f4ecf46..1d95c5bc92 100644 --- a/src/bin/network/ping/Jamfile +++ b/src/bin/network/ping/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src bin network ping ; SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; # We need the public network headers also when not compiling for Haiku. # Unfortunately we get more than we want, namely all POSIX headers. diff --git a/src/bin/network/ppp_up/Jamfile b/src/bin/network/ppp_up/Jamfile index c9071b77ff..6ef1a22eda 100644 --- a/src/bin/network/ppp_up/Jamfile +++ b/src/bin/network/ppp_up/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src bin ppp_up ; SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; # We need the public network headers also when not compiling for Haiku. # Unfortunately we get more than we want, namely all POSIX headers. diff --git a/src/bin/network/pppconfig/Jamfile b/src/bin/network/pppconfig/Jamfile index c43597a7ed..9984a4afa3 100644 --- a/src/bin/network/pppconfig/Jamfile +++ b/src/bin/network/pppconfig/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src bin pppconfig ; SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; # We need the public network headers also when not compiling for Haiku. # Unfortunately we get more than we want, namely all POSIX headers. diff --git a/src/bin/network/route/Jamfile b/src/bin/network/route/Jamfile index 1ec15fa494..a761a3e10a 100644 --- a/src/bin/network/route/Jamfile +++ b/src/bin/network/route/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src bin network route ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; # We need the public network headers also when not compiling for Haiku. # Unfortunately we get more than we want, namely all POSIX headers. diff --git a/src/bin/network/traceroute/Jamfile b/src/bin/network/traceroute/Jamfile index 5ff8cc397e..12c2f9812d 100644 --- a/src/bin/network/traceroute/Jamfile +++ b/src/bin/network/traceroute/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src bin network traceroute ; SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; # We need the public network headers also when not compiling for Haiku. # Unfortunately we get more than we want, namely all POSIX headers. diff --git a/src/bin/pcmcia-cs/Jamfile b/src/bin/pcmcia-cs/Jamfile index dab560af03..c56fb2069e 100644 --- a/src/bin/pcmcia-cs/Jamfile +++ b/src/bin/pcmcia-cs/Jamfile @@ -2,11 +2,11 @@ SubDir HAIKU_TOP src bin pcmcia-cs ; SetSubDirSupportedPlatformsBeOSCompatible ; -if $(TARGET_PLATFORM) != haiku { - UseHeaders [ FDirName $(HAIKU_TOP) headers os drivers ] : true ; - # We need the public pcmcia headers also when not compiling for Haiku. +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { + UseHeaders [ FDirName $(HAIKU_TOP) headers os drivers ] : true ; + # We need the public pcmcia headers also when not compiling for Haiku. UseHeaders [ FDirName $(HAIKU_TOP) headers os support ] : true ; - # We need Errors.h also when not compiling for Haiku. + # We need Errors.h also when not compiling for Haiku. } StdBinCommands diff --git a/src/kits/support/Jamfile b/src/kits/support/Jamfile index c8970a9167..004a4e26ca 100644 --- a/src/kits/support/Jamfile +++ b/src/kits/support/Jamfile @@ -1,12 +1,6 @@ SubDir HAIKU_TOP src kits support ; SetSubDirSupportedPlatforms haiku libbe_test ; -#if $(TARGET_PLATFORM) != haiku { -# UseHeaders [ FStandardOSHeaders ] : true ; -# UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; -# # TODO: POSIX headers shouldn't be used. Needed for strlcpy() and -# # addr_t. -#} UsePrivateHeaders shared app media ; diff --git a/src/kits/textencoding/Jamfile b/src/kits/textencoding/Jamfile index 9a07f3abea..06b7d357a1 100644 --- a/src/kits/textencoding/Jamfile +++ b/src/kits/textencoding/Jamfile @@ -6,7 +6,7 @@ AddSubDirSupportedPlatforms libbe_test ; UsePrivateHeaders textencoding ; SubDirSysHdrs [ FDirName $(SUBDIR) libiconv ] ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { # Argh! Just for . UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; } diff --git a/src/kits/textencoding/libiconv/Jamfile b/src/kits/textencoding/libiconv/Jamfile index 2d09e8f35e..96c3b7f296 100644 --- a/src/kits/textencoding/libiconv/Jamfile +++ b/src/kits/textencoding/libiconv/Jamfile @@ -20,7 +20,7 @@ SubDirCcFlags SubDirSysHdrs $(SUBDIR) ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { # Argh! Just for . UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; } diff --git a/src/kits/tracker/Jamfile b/src/kits/tracker/Jamfile index e8882f91a5..8efc05c2b3 100644 --- a/src/kits/tracker/Jamfile +++ b/src/kits/tracker/Jamfile @@ -18,7 +18,7 @@ SubDirC++Flags ; local vector_icon_libs ; -if $(TARGET_PLATFORM) = haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { vector_icon_libs = libicon.a libagg.a ; } diff --git a/src/preferences/keyboard/Jamfile b/src/preferences/keyboard/Jamfile index f13f0c45f5..189336bd36 100644 --- a/src/preferences/keyboard/Jamfile +++ b/src/preferences/keyboard/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src preferences keyboard ; SetSubDirSupportedPlatformsBeOSCompatible ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { SubDirC++Flags -DCOMPILE_FOR_R5 ; # SubDirC++Flags -fmultiple-symbol-spaces ; } diff --git a/src/preferences/media/Jamfile b/src/preferences/media/Jamfile index 032b5de3f4..a98fd6dc21 100644 --- a/src/preferences/media/Jamfile +++ b/src/preferences/media/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src preferences media ; SetSubDirSupportedPlatformsBeOSCompatible ; -if $(TARGET_PLATFORM) != haiku { +if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { SubDirC++Flags -fmultiple-symbol-spaces ; } diff --git a/src/preferences/sounds/Jamfile b/src/preferences/sounds/Jamfile index 95099c65be..cc8c2c6cbf 100644 --- a/src/preferences/sounds/Jamfile +++ b/src/preferences/sounds/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src preferences sounds ; SetSubDirSupportedPlatformsBeOSCompatible ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { SubDirC++Flags -fmultiple-symbol-spaces ; } diff --git a/src/preferences/virtualmemory/Jamfile b/src/preferences/virtualmemory/Jamfile index 06e4352e01..170ba1ef40 100644 --- a/src/preferences/virtualmemory/Jamfile +++ b/src/preferences/virtualmemory/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src preferences virtualmemory ; SetSubDirSupportedPlatformsBeOSCompatible ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { DRIVER_SETTINGS = driver_settings.c ; } @@ -16,7 +16,7 @@ Preference VirtualMemory : : VirtualMemory.rdef ; -if $(TARGET_PLATFORM) != haiku { +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { SEARCH on [ FGristFiles driver_settings.c ] += [ FDirName $(HAIKU_TOP) src system libroot os ] ; } diff --git a/src/tools/bfs_shell/Jamfile b/src/tools/bfs_shell/Jamfile index 1878ff00f3..674200abf3 100644 --- a/src/tools/bfs_shell/Jamfile +++ b/src/tools/bfs_shell/Jamfile @@ -20,7 +20,7 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems bfs ] ; } local libHaikuCompat ; -if $(HOST_PLATFORM_BEOS_COMPATIBLE) && $(HOST_PLATFORM) != haiku { +if $(HOST_PLATFORM_BEOS_COMPATIBLE) && ! $(HOST_PLATFORM_HAIKU_COMPATIBLE) { libHaikuCompat = libhaikucompat_build.a ; }