diff --git a/Jamfile b/Jamfile index b6464062a2..f14407e0da 100644 --- a/Jamfile +++ b/Jamfile @@ -15,7 +15,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { if ! $(HAIKU_BOOTSTRAP_BUILD) { # primary architecture AddHaikuImagePackages - bzip2 ctags findutils grep sed tar which zlib + bzip2 ctags findutils gawk grep sed tar which zlib ffmpeg freetype icu jpeg libpng libsolv mesa mesa_devel mesa_swrast glu ; diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles index 3e5de171e0..e2a672ef2f 100644 --- a/build/jam/DefaultBuildProfiles +++ b/build/jam/DefaultBuildProfiles @@ -129,6 +129,7 @@ rule DefineDefaultBuildProfiles flex freetype freetype_devel + gawk gcc grep haikuporter diff --git a/build/jam/images/HaikuImage b/build/jam/images/HaikuImage index bf75bba66a..2158757099 100644 --- a/build/jam/images/HaikuImage +++ b/build/jam/images/HaikuImage @@ -14,7 +14,7 @@ SYSTEM_BIN = [ FFilterByBuildFeatures echo eject env error expand expr factor false fdinfo ffm filepanel finddir findpaths FirstBootPrompt fmt fold fortune fstrim ftp ftpd funzip fwcontrol@x86 - gawk gdb@x86 getarch getlimits groupadd groupdel groupmod groups gzip gzexe + gdb@x86 getarch getlimits groupadd groupdel groupmod groups gzip gzexe hd head hey hostname id ident ifconfig install installsound iroster isvolume ideinfo@ide idestatus@ide diff --git a/build/jam/images/HaikuImageBootstrap b/build/jam/images/HaikuImageBootstrap index 7d54d16a06..708486cb05 100644 --- a/build/jam/images/HaikuImageBootstrap +++ b/build/jam/images/HaikuImageBootstrap @@ -14,7 +14,7 @@ SYSTEM_BIN = [ FFilterByBuildFeatures echo eject env error expand expr factor false fdinfo ffm filepanel find finddir findpaths fmt fold fortune frcode ftp ftpd funzip - gawk gdb@x86 getarch getlimits groupadd groupdel groupmod groups gzip gzexe + gdb@x86 getarch getlimits groupadd groupdel groupmod groups gzip gzexe hd head hey hostname id ident ifconfig install isvolume ideinfo@ide idestatus@ide diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku index 987f16a3b8..7fcede57ad 100644 --- a/build/jam/packages/Haiku +++ b/build/jam/packages/Haiku @@ -125,7 +125,6 @@ AddSymlinkToPackage bin : gzip : gunzip ; AddSymlinkToPackage bin : gzip : zcat ; AddSymlinkToPackage bin : zdiff : zcmp ; AddSymlinkToPackage bin : unzip : zipinfo ; -AddSymlinkToPackage bin : gawk : awk ; # scripts and data files local bootScripts = Bootscript Bootscript.cd SetupEnvironment Netscript diff --git a/build/jam/packages/HaikuBootstrap b/build/jam/packages/HaikuBootstrap index 9986a60d44..a017b35103 100644 --- a/build/jam/packages/HaikuBootstrap +++ b/build/jam/packages/HaikuBootstrap @@ -122,7 +122,6 @@ AddSymlinkToPackage bin : gzip : gunzip ; AddSymlinkToPackage bin : gzip : zcat ; AddSymlinkToPackage bin : zdiff : zcmp ; AddSymlinkToPackage bin : unzip : zipinfo ; -AddSymlinkToPackage bin : gawk : awk ; # scripts and data files local bootScripts = Bootscript Bootscript.cd SetupEnvironment Netscript