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

* Prefixed the INCLUDE_GPL_ADDONS variable by "HAIKU_". configure needs to

Browse Source 
be run again or generated/build/BuildConfig needs to be adjusted manually.
* Removed bochs debug hack.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34721 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-12-20 13:55:45 +00:00
parent 32a0e3810e
commit 0b58d8440c
10 changed files with 16 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+4 -6
View File
@@ -275,10 +275,8 @@ SetIncludePropertiesVariables HAIKU ;
HAIKU_ASFLAGS = ;
# C/C++ flags
HAIKU_KERNEL_CCFLAGS += -finline -fno-builtin
-DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) ;
HAIKU_KERNEL_C++FLAGS += -finline -fno-builtin -fno-exceptions
-DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) ;
HAIKU_KERNEL_CCFLAGS += -finline -fno-builtin ;
HAIKU_KERNEL_C++FLAGS += -finline -fno-builtin -fno-exceptions ;
HAIKU_KERNEL_DEFINES += _KERNEL_MODE ;
if $(HAIKU_GCC_VERSION[1]) >= 3 {
@@ -561,9 +559,9 @@ if $(HOST_PLATFORM) != cygwin {
}
HOST_KERNEL_CCFLAGS += $(HOST_GCC_BASE_FLAGS) -finline -fno-builtin
-DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) -D_KERNEL_MODE ;
-D_KERNEL_MODE ;
HOST_KERNEL_C++FLAGS += $(HOST_GCC_BASE_FLAGS) -finline -fno-builtin
-fno-exceptions -DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) -D_KERNEL_MODE ;
-fno-exceptions -D_KERNEL_MODE ;
HOST_KERNEL_DEFINES += _KERNEL_MODE ;
HOST_KERNEL_PIC_CCFLAGS = -fno-pic ;
build/jam/FloppyBootImage
+1 -1
View File
@@ -12,7 +12,7 @@ if $(TARGET_ARCH) = x86 {
}
local GPL_ONLY = ;
if $(INCLUDE_GPL_ADDONS) = 1 {
if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
GPL_ONLY = "" ;
}
build/jam/HaikuImage
+1 -1
View File
@@ -14,7 +14,7 @@ if $(TARGET_ARCH) = x86 {
}
local GPL_ONLY = ;
if $(INCLUDE_GPL_ADDONS) = 1 {
if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
GPL_ONLY = "" ;
}
build/jam/MiscRules
+1 -1
View File
@@ -62,7 +62,7 @@ rule SubIncludeGPL
{
# SubInclude rule that can be used to conditionally include GPL licensed
# add-ons
if $(INCLUDE_GPL_ADDONS) = 1 {
if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
SubInclude $(1) ;
}
}
build/jam/NetBootArchive
+1 -1
View File
@@ -10,7 +10,7 @@ if $(TARGET_ARCH) = x86 {
}
local GPL_ONLY = ;
if $(INCLUDE_GPL_ADDONS) = 1 {
if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
GPL_ONLY = "" ;
}
configure
Vendored
+1 -6
View File
@@ -26,8 +26,6 @@ options:
To disable building the alternative libraries
the variable HAIKU_ADD_ALTERNATIVE_GCC_LIBS can be
unset in the UserBuildConfig file.
--bochs-debug Enables bochs serial debug emulation (activated
via kernel settings file).
--build-cross-tools <build tools dir>
Assume cross compilation. <build tools dir>
defines the location of the build tools sources.
@@ -267,7 +265,6 @@ haikuSharedLibSupCxx=
haikuCxxHeadersDir=
hostGCCVersion=`gcc -dumpversion`
hostGCCMachine=`gcc -dumpmachine`
bochsDebug=0
includeGPLAddOns=0
includePatentedCode=0
include3rdParty=0
@@ -315,7 +312,6 @@ while [ $# -gt 0 ] ; do
cd $currentDir
shift 2
;;
--bochs-debug) bochsDebug=1; shift 1;;
--build-cross-tools) assertparam "$1" $#; buildCrossTools=$2; shift 2;;
--build-cross-tools-gcc4)
assertparams "$1" 2 $#
@@ -474,8 +470,7 @@ cat << EOF > "$buildOutputDir/BuildConfig"
TARGET_PLATFORM ?= "${target}" ;
HOST_PLATFORM ?= "${buildPlatform}" ;
BOCHS_DEBUG_HACK ?= "${bochsDebug}" ;
INCLUDE_GPL_ADDONS ?= "${includeGPLAddOns}" ;
HAIKU_INCLUDE_GPL_ADDONS ?= "${includeGPLAddOns}" ;
HAIKU_INCLUDE_PATENTED_CODE ?= "${includePatentedCode}" ;
HAIKU_INCLUDE_3RDPARTY ?= "${include3rdParty}" ;
HAIKU_ENABLE_MULTIUSER ?= "${enableMultiuser}" ;
src/add-ons/media/plugins/ffmpeg/Jamfile
+1 -1
View File
@@ -87,7 +87,7 @@ if $(TARGET_ARCH) = x86 {
HAIKU_FFMPEG_DEFINES += HAVE_VIS=1 ;
}
if $(INCLUDE_GPL_ADDONS) = 1 {
if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
HAIKU_FFMPEG_DEFINES += CONFIG_GPL=1 ;
} else {
HAIKU_FFMPEG_DEFINES += CONFIG_GPL=0 ;
src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
+2 -2
View File
@@ -33,7 +33,7 @@ if $(HAIKU_FFMPEG_USE_MMX) = 1 {
fft_mmx.nasm
dsputil_yasm.nasm
;
if $(INCLUDE_GPL_ADDONS) = 1 {
if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
mmxSources +=
idct_mmx.c
;
@@ -49,7 +49,7 @@ if $(HAIKU_FFMPEG_USE_SSSE3) = 1 {
vp3dsp_sse2.c
vp6dsp_sse2.c
;
if $(INCLUDE_GPL_ADDONS) = 1 {
if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
sseSources +=
h264_idct_sse2.nasm
h264_deblock_sse2.nasm
src/add-ons/media/plugins/ffmpeg/libswscale/Jamfile
+1 -1
View File
@@ -12,7 +12,7 @@ local archSources ;
archSources = ;
if $(TARGET_ARCH) = x86 {
if $(INCLUDE_GPL_ADDONS) = 1 {
if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
archSources += yuv2rgb_mmx.c ;
SubDirHdrs [ FDirName $(SUBDIR) $(TARGET_ARCH) ] ;
}
src/system/kernel/arch/x86/arch_debug_console.cpp
+2 -31
View File
@@ -23,16 +23,6 @@
#include <stdlib.h>
/* If you've enabled Bochs debug output in the kernel driver
* settings and has defined this, serial debug output will be
* disabled and redirected to Bochs.
* Define this only if not used as compile parameter.
*/
#ifndef BOCHS_DEBUG_HACK
# define BOCHS_DEBUG_HACK 0
#endif
enum serial_register_offsets {
SERIAL_TRANSMIT_BUFFER = 0,
SERIAL_RECEIVE_BUFFER = 0,
@@ -74,9 +64,6 @@ static uint16 sSerialBasePort = 0x3f8;
// COM1 is the default debug output port
static bool sKeyboardHandlerInstalled = false;
#if BOCHS_DEBUG_HACK
static bool sBochsOutput = false;
#endif
static spinlock sSerialOutputSpinlock = B_SPINLOCK_INITIALIZER;
@@ -84,13 +71,6 @@ static spinlock sSerialOutputSpinlock = B_SPINLOCK_INITIALIZER;
static void
put_char(const char c)
{
#if BOCHS_DEBUG_HACK
if (sBochsOutput) {
out8(c, 0xe9);
return;
}
#endif
// wait until the transmitter empty bit is set
while ((in8(sSerialBasePort + SERIAL_LINE_STATUS) & 0x20) == 0)
asm volatile ("pause;");
@@ -319,11 +299,6 @@ arch_debug_blue_screen_getchar(void)
char
arch_debug_serial_getchar(void)
{
#if BOCHS_DEBUG_HACK
if (sBochsOutput)
return arch_debug_blue_screen_getchar();
#endif
while ((in8(sSerialBasePort + SERIAL_LINE_STATUS) & 0x1) == 0)
asm volatile ("pause;");
@@ -419,12 +394,8 @@ arch_debug_console_init_settings(kernel_args *args)
// get debug settings
handle = load_driver_settings("kernel");
if (handle != NULL) {
const char *value;
#if BOCHS_DEBUG_HACK
sBochsOutput = get_driver_boolean_parameter(handle, "bochs_debug_output", false, false);
#endif
value = get_driver_parameter(handle, "serial_debug_port", NULL, NULL);
const char *value = get_driver_parameter(handle, "serial_debug_port",
NULL, NULL);
if (value != NULL) {
int32 number = strtol(value, NULL, 0);
if (number >= MAX_SERIAL_PORTS) {