Remove more stuff from the Haiku bootstrap packages/image
Namely GL/Mesa and libtiff.
This commit is contained in:
@@ -9,7 +9,7 @@ include [ FDirName $(HAIKU_BUILD_RULES_DIR) BuildFeatures ] ;
|
||||
# Include packages that are required by all images.
|
||||
if $(HAIKU_BOOTSTRAP_BUILD) {
|
||||
AddHaikuImagePackages
|
||||
bzip2 freetype glu grep icu libsolv mesa sed tar zlib
|
||||
freetype grep icu libsolv sed zlib
|
||||
:
|
||||
system
|
||||
;
|
||||
|
||||
@@ -62,13 +62,13 @@ SYSTEM_DEMOS = ;
|
||||
SYSTEM_LIBS = [ FFilterByBuildFeatures
|
||||
libbe.so libbsd.so libbnetapi.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
|
||||
libnetwork.so
|
||||
libpackage.so
|
||||
<revisioned>libroot.so
|
||||
libscreensaver.so
|
||||
libtextencoding.so libtiff.so libtracker.so libtranslation.so
|
||||
libtextencoding.so libtracker.so libtranslation.so
|
||||
$(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++)
|
||||
] ;
|
||||
PRIVATE_SYSTEM_LIBS = [ FFilterByBuildFeatures
|
||||
|
||||
@@ -229,13 +229,6 @@ AddFilesToPackage add-ons accelerants : $(SYSTEM_ADD_ONS_ACCELERANTS) ;
|
||||
AddFilesToPackage add-ons Translators : $(SYSTEM_ADD_ONS_TRANSLATORS) ;
|
||||
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
|
||||
: FileType-F Mark\ as… Mark\ as\ Read-R Open\ Target\ Folder-O
|
||||
Open\ Terminal-T ZipOMatic-Z ;
|
||||
|
||||
@@ -68,7 +68,9 @@ AddHeaderDirectoryToPackage compatibility bsd : bsd ;
|
||||
AddHeaderDirectoryToPackage compatibility gnu : gnu ;
|
||||
|
||||
# third party libs headers
|
||||
if ! $(HAIKU_BOOTSTRAP_BUILD) {
|
||||
AddHeaderDirectoryToPackage libs tiff : 3rdparty ;
|
||||
}
|
||||
|
||||
# cpp headers
|
||||
if $(HAIKU_GCC_VERSION[1]) = 2 {
|
||||
@@ -78,7 +80,7 @@ if $(HAIKU_GCC_VERSION[1]) = 2 {
|
||||
}
|
||||
|
||||
# OpenGL headers
|
||||
if $(TARGET_ARCH) = x86 {
|
||||
if $(TARGET_ARCH) = x86 && ! $(HAIKU_BOOTSTRAP_BUILD) {
|
||||
local mesaGlHeaders
|
||||
= [ FDirName [ BuildFeatureAttribute mesa : headers : path ] GL ] ;
|
||||
local mesaGlHeadersDependency = [ BuildFeatureAttribute mesa : headers ] ;
|
||||
|
||||
Reference in New Issue
Block a user