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

build: Deprecate SetSubDirSupportedPlatformsBeOSCompatible.

Browse Source 
By default, all targets support the "haiku" platform, and we no longer
support building for BeOS, Dan0, Zeta, or other BeOS-compatible targets,
so this is no longer needed.

Also remove all references to the non-Haiku compatible platforms, and
change all BEOS_COMPATIBLE checks to HAIKU_COMPATIBLE. Removal of
all SetSubDirSupportedPlatformsBeOSCompatible invocations
will be in the next commit.
This commit is contained in:
Augustin Cavalier
2019-03-30 14:54:14 -04:00
parent a1c2d3d653
commit b357daa5c5
25 changed files with 22 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+3 -14
View File
@@ -96,12 +96,6 @@ ProcessCommandLineArguments ;
# supported debug levels
HAIKU_DEBUG_LEVELS = 0 1 2 3 4 5 ;
# BeOS, BONE, Dan0 compatible platforms
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 ;
# configuration header directories
HAIKU_CONFIG_HEADERS = [ FDirName $(HAIKU_TOP) build user_config_headers ]
[ FDirName $(HAIKU_TOP) build config_headers ] ;
@@ -120,11 +114,6 @@ for architecture in $(HAIKU_PACKAGING_ARCHS) {
ArchitectureSetup $(architecture) ;
}
# TODO: Might not be needed anymore.
if $(HAIKU_HOST_BUILD_ONLY) = 1 {
HAIKU_GCC_VERSION = 0 0 0 ;
}
if $(HAIKU_PACKAGING_ARCH) {
KernelArchitectureSetup $(HAIKU_PACKAGING_ARCH) ;
}
@@ -368,8 +357,8 @@ HOST_PRIVATE_KERNEL_HEADERS = ;
# private shared kernel/libroot headers
HOST_PRIVATE_SYSTEM_HEADERS = ;
# under BeOS use copyattr instead of cp
if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
# under Haiku use copyattr instead of cp
if $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
CP = copyattr --data ;
}
@@ -387,7 +376,7 @@ HOST_LIBROOT = libroot_build_function_remapper.a libroot_build.so ;
HOST_STATIC_LIBROOT = libroot_build_function_remapper.a libroot_build.a ;
HOST_LIBBE = libbe_build.so ;
if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
if $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
# the C++ standard and support libraries
if $(HOST_GCC_VERSION[1]) < 3 {
HOST_LIBSTDC++ = stdc++.r4 ;
build/jam/HelperRules
+2 -41
View File
@@ -170,33 +170,16 @@ rule SetPlatformCompatibilityFlagVariables
EXIT "specify it manually." ;
}
# special case: Haiku libbe.so built for testing under BeOS
# special case: Haiku libbe.so built for testing under Haiku
if $(platform) = libbe_test {
platform = $(HOST_PLATFORM) ;
}
$(varPrefix)_PLATFORM_BEOS_COMPATIBLE = ;
$(varPrefix)_PLATFORM_BONE_COMPATIBLE = ;
$(varPrefix)_PLATFORM_DANO_COMPATIBLE = ;
# unset variables first
$(varPrefix)_PLATFORM_HAIKU_COMPATIBLE = ;
switch $(platform)
{
case r5 :
{
$(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 ;
@@ -218,30 +201,11 @@ 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
?= $($(varPrefix)_PLATFORM_DANO_COMPATIBLE) ;
$(varPrefix)_PLATFORM_BEOS_COMPATIBLE
?= $($(varPrefix)_PLATFORM_BONE_COMPATIBLE) ;
# 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
?= $($(varPrefix)_PLATFORM_BONE_COMPATIBLE) ;
$(varPrefix)_PLATFORM_(r5)_COMPATIBLE
?= $($(varPrefix)_PLATFORM_BEOS_COMPATIBLE) ;
$(varPrefix)_PLATFORM_(libbe_test)_COMPATIBLE
?= $($(varPrefix)_PLATFORM_BEOS_COMPATIBLE) ;
}
rule FAnalyzeGCCVersion
@@ -328,9 +292,6 @@ rule AddSubDirSupportedPlatforms
rule SetSubDirSupportedPlatformsBeOSCompatible
{
# SetSubDirSupportedPlatformsBeOSCompatible ;
SUPPORTED_PLATFORMS = $(HAIKU_BEOS_COMPATIBLE_PLATFORMS) ;
}
rule IsPlatformSupportedForTarget