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

Remove more stuff from the Haiku bootstrap packages/image

Browse Source 
Namely GL/Mesa and libtiff.
This commit is contained in:
Ingo Weinhold
2013-07-21 03:34:35 +02:00
parent b9eec5192d
commit 33f23ea80f
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamfile
+1 -1
View File
@@ -9,7 +9,7 @@ include [ FDirName $(HAIKU_BUILD_RULES_DIR) BuildFeatures ] ;
# Include packages that are required by all images. # Include packages that are required by all images.
if $(HAIKU_BOOTSTRAP_BUILD) { if $(HAIKU_BOOTSTRAP_BUILD) {
AddHaikuImagePackages AddHaikuImagePackages
bzip2 freetype glu grep icu libsolv mesa sed tar zlib freetype grep icu libsolv sed zlib
: :
system system
; ;
build/jam/images/HaikuImageBootstrap
+2 -2
View File
@@ -62,13 +62,13 @@ SYSTEM_DEMOS = ;
SYSTEM_LIBS = [ FFilterByBuildFeatures SYSTEM_LIBS = [ FFilterByBuildFeatures
libbe.so libbsd.so libbnetapi.so libbe.so libbsd.so libbnetapi.so
libdebug.so libdevice.so libdebug.so libdevice.so
libgame.so libGL.so@x86 libglut.so@x86 libgame.so
libgnu.so libmail.so libmedia.so libmidi.so libmidi2.so libgnu.so libmail.so libmedia.so libmidi.so libmidi2.so
libnetwork.so libnetwork.so
libpackage.so libpackage.so
<revisioned>libroot.so <revisioned>libroot.so
libscreensaver.so libscreensaver.so
libtextencoding.so libtiff.so libtracker.so libtranslation.so libtextencoding.so libtracker.so libtranslation.so
$(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++) $(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++)
] ; ] ;
PRIVATE_SYSTEM_LIBS = [ FFilterByBuildFeatures PRIVATE_SYSTEM_LIBS = [ FFilterByBuildFeatures
build/jam/packages/HaikuBootstrap
-7
View File
@@ -229,13 +229,6 @@ AddFilesToPackage add-ons accelerants : $(SYSTEM_ADD_ONS_ACCELERANTS) ;
AddFilesToPackage add-ons Translators : $(SYSTEM_ADD_ONS_TRANSLATORS) ; AddFilesToPackage add-ons Translators : $(SYSTEM_ADD_ONS_TRANSLATORS) ;
AddFilesToPackage add-ons locale catalogs : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ; AddFilesToPackage add-ons locale catalogs : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
AddFilesToPackage add-ons opengl :
x86 @{
Legacy\ Software\ Rasterizer@gcc2
Software\ Rasterizer@!gcc2
}@ # x86
;
AddFilesToPackage add-ons Tracker AddFilesToPackage add-ons Tracker
: FileType-F Mark\ as… Mark\ as\ Read-R Open\ Target\ Folder-O : FileType-F Mark\ as… Mark\ as\ Read-R Open\ Target\ Folder-O
Open\ Terminal-T ZipOMatic-Z ; Open\ Terminal-T ZipOMatic-Z ;
build/jam/packages/HaikuDevel
+3 -1
View File
@@ -68,7 +68,9 @@ AddHeaderDirectoryToPackage compatibility bsd : bsd ;
AddHeaderDirectoryToPackage compatibility gnu : gnu ; AddHeaderDirectoryToPackage compatibility gnu : gnu ;
# third party libs headers # third party libs headers
if ! $(HAIKU_BOOTSTRAP_BUILD) {
AddHeaderDirectoryToPackage libs tiff : 3rdparty ; AddHeaderDirectoryToPackage libs tiff : 3rdparty ;
}
# cpp headers # cpp headers
if $(HAIKU_GCC_VERSION[1]) = 2 { if $(HAIKU_GCC_VERSION[1]) = 2 {
@@ -78,7 +80,7 @@ if $(HAIKU_GCC_VERSION[1]) = 2 {
} }
# OpenGL headers # OpenGL headers
if $(TARGET_ARCH) = x86 { if $(TARGET_ARCH) = x86 && ! $(HAIKU_BOOTSTRAP_BUILD) {
local mesaGlHeaders local mesaGlHeaders
= [ FDirName [ BuildFeatureAttribute mesa : headers : path ] GL ] ; = [ FDirName [ BuildFeatureAttribute mesa : headers : path ] GL ] ;
local mesaGlHeadersDependency = [ BuildFeatureAttribute mesa : headers ] ; local mesaGlHeadersDependency = [ BuildFeatureAttribute mesa : headers ] ;