Add all bootstrap packages in DefaultBuildProfiles
* Don't handle the bootstrap case in the main Jamfile. Add all bootstrap packages to the image in the profile definition. That's less confusing, hopefully. * Add the missing bootstrap packages (ncurses*, libtool_libltdl). The would normally be added in build_haiku_image when the package dependencies are resolved, but we don't do that for the bootstrap image, since we intentionally leave some dependencies out (e.g. perl) because they can be built.
This commit is contained in:
@@ -7,13 +7,7 @@ Depends files : doc_files ;
|
||||
include [ FDirName $(HAIKU_BUILD_RULES_DIR) BuildFeatures ] ;
|
||||
|
||||
# Include packages that are required by all images.
|
||||
if $(HAIKU_BOOTSTRAP_BUILD) {
|
||||
AddHaikuImagePackages
|
||||
freetype grep icu libsolv sed zlib
|
||||
:
|
||||
system
|
||||
;
|
||||
} else {
|
||||
if ! $(HAIKU_BOOTSTRAP_BUILD) {
|
||||
AddHaikuImagePackages
|
||||
bzip2 ctags ffmpeg freetype glu grep icu jpeg libpng libsolv mesa sed
|
||||
tar zlib
|
||||
|
||||
@@ -105,7 +105,15 @@ rule DefineDefaultBuildProfiles
|
||||
HAIKU_IMAGE_SIZE = 1000 ;
|
||||
|
||||
AddHaikuImagePackages
|
||||
freetype
|
||||
freetype_devel
|
||||
grep
|
||||
icu
|
||||
libsolv
|
||||
ncurses
|
||||
ncurses_devel
|
||||
sed
|
||||
zlib
|
||||
zlib_devel
|
||||
:
|
||||
system
|
||||
@@ -121,8 +129,10 @@ rule DefineDefaultBuildProfiles
|
||||
haikuporter
|
||||
# jam
|
||||
libtool
|
||||
libtool_libltdl
|
||||
m4
|
||||
make
|
||||
# makeinfo
|
||||
# mkdepend
|
||||
# perl
|
||||
python
|
||||
|
||||
Reference in New Issue
Block a user