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

Merge branch 'master' into sam460ex

Browse Source
This commit is contained in:
François Revol
2013-03-28 09:47:50 +01:00
parent 8b72ce2651 4bc52e9f78
commit d4eea7d43c
217 changed files with 27841 additions and 15813 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildFeatures
+1 -1
View File
@@ -344,7 +344,7 @@ if $(TARGET_ARCH) = x86 {
if $(TARGET_ARCH) = x86 {
local zipFile ;
if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_MESA_FILE = mesa-9.0.2-x86-gcc4-2013-02-17.zip ;
HAIKU_MESA_FILE = mesa-9.1.1-x86-gcc4-2013-03-20.zip ;
} else {
HAIKU_MESA_FILE = mesa-7.8.2-x86-gcc2-2013-02-17.zip ;
}
build/jam/BuildSetup
+18 -12
View File
@@ -131,12 +131,22 @@ if $(HAIKU_USE_GCC_PIPE) = 1 {
# results in some broken code.
# TODO: remove the -fno-strict-aliasing option when all code has been
# analyzed/fixed with regard to aliasing.
# TODO: retest/remove the -fno-tree-vrp option as soon as we have updated our
# gcc4 compiler. See this discussion on some issues:
# http://www.freelists.org/post/haiku-development/hrev45320-Yet-another-nonobvious-effect-of-ftreevrp-optimization
if $(HAIKU_GCC_VERSION[1]) >= 3 {
HAIKU_GCC_BASE_FLAGS += -fno-strict-aliasing ;
HAIKU_GCC_BASE_FLAGS += -fno-strict-aliasing -fno-tree-vrp ;
}
# disable array bounds warnings on gcc 4.6 or newer since they trigger
# too many false positives. Coverity does a better job of this kind of analysis
# anyways.
if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_GCC_BASE_FLAGS += -Wno-array-bounds ;
}
if $(HOST_GCC_VERSION[1]) >= 3 {
HOST_GCC_BASE_FLAGS += -fno-strict-aliasing ;
HOST_GCC_BASE_FLAGS += -fno-strict-aliasing -fno-tree-vrp ;
}
# override gcc 2.95.3's header directory -- strictly necessary only when using
@@ -350,12 +360,10 @@ if $(HAIKU_GCC_VERSION[1]) >= 3 {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_C++FLAGS += -Wno-deprecated ;
if $(HAIKU_GCC_VERSION[2]) >= 3 {
HAIKU_KERNEL_CCFLAGS += -ffreestanding ;
HAIKU_KERNEL_C++FLAGS += -ffreestanding ;
HAIKU_BOOT_CCFLAGS += -ffreestanding ;
HAIKU_BOOT_C++FLAGS += -ffreestanding ;
}
HAIKU_KERNEL_CCFLAGS += -ffreestanding ;
HAIKU_KERNEL_C++FLAGS += -ffreestanding ;
HAIKU_BOOT_CCFLAGS += -ffreestanding ;
HAIKU_BOOT_C++FLAGS += -ffreestanding ;
}
HAIKU_KERNEL_PIC_CCFLAGS = -fno-pic ;
@@ -1249,10 +1257,8 @@ if $(HAIKU_GCC_VERSION[1]) >= 4 {
# -Wuninitialized gives too many false positives.
HAIKU_WERRORFLAGS = -Wno-error=uninitialized ;
if $(HAIKU_GCC_VERSION[2]) >= 6 {
# TODO: remove the -Wno-unused-but-set-variable option
HAIKU_WERRORFLAGS += -Wno-unused-but-set-variable ;
}
# TODO: remove the -Wno-unused-but-set-variable option
HAIKU_WERRORFLAGS += -Wno-unused-but-set-variable ;
}
rule EnableWerror dirTokens : scope {
build/jam/OptionalPackages
+14 -1
View File
@@ -39,11 +39,15 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
# Ctags - exuberant ctags (source files indexing)
# Curl - a client that groks URLs
# CVS - the version control system
# DemoPackage_Audio - a collection of audio files suitable for demonstrations
# DemoPackage_Data - a collection of data files suitable for demonstrations
# DemoPackage_Image - a collection of image files suitable for demonstrations
# DemoPackage_Video - a collection of video files suitable for demonstrations
# Development - more complete dev environment (including autotools)
# DevelopmentBase - basic development environment (gcc, headers, libs,...)
# DevelopmentJava - JamVM, a Java Virtual machine, GNU Classpath, ECJ
# DevelopmentMin - development headers, libs, tools, from sources only
# DevelopmentPowerPC - Cross compiling environment for PowerPC
# DevelopmentPowerPC - Cross compiling environment for PowerPC
# Doxygen - Generate documentation from source code
# Droid - Font family from Google's Android project
# Expat - XML parsing libraries
@@ -90,6 +94,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
# Sed - the ultimate stream editor
# SQLite - the database implementation
# Subversion - the version control system
# System-sounds - a collection of system sounds
# TagLib - id3 tag library
# Tar - archiving utility
# TimGMSoundFont - a good quality General MIDI Sound Font
@@ -2014,6 +2019,14 @@ if [ IsOptionalHaikuImagePackageAdded Subversion ] {
}
# System-sounds
if [ IsOptionalHaikuImagePackageAdded System-sounds ] {
InstallOptionalHaikuImagePackage System-sounds-2013-03-12.zip
: $(baseURL)/System-sounds-2013-03-12.zip
: ;
}
# TagLib
if [ IsOptionalHaikuImagePackageAdded TagLib ] {
if $(TARGET_ARCH) != x86 {