[haiku-commits] haiku: hrev46929 - in build/jam: images packages
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 25 Feb 2014 22:21:26 +0100 (CET)
hrev46929 adds 1 changeset to branch 'master'
old head: e9dcbbeb358ccdfc8903007c0cc348e9078bf8e0
new head: 91e3737dd8a7b24cb60d13c5d7cc66ad4c175934
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=91e3737+%5Ee9dcbbe
----------------------------------------------------------------------------
91e3737: gawk: use the HaikuPorts package.
* left the in-tree version as its libintl is used by gdb.
* added as bootstrap package.
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46929
Commit: 91e3737dd8a7b24cb60d13c5d7cc66ad4c175934
URL: http://cgit.haiku-os.org/haiku/commit/?id=91e3737
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Tue Feb 25 21:15:13 2014 UTC
----------------------------------------------------------------------------
6 files changed, 4 insertions(+), 5 deletions(-)
Jamfile | 2 +-
build/jam/DefaultBuildProfiles | 1 +
build/jam/images/HaikuImage | 2 +-
build/jam/images/HaikuImageBootstrap | 2 +-
build/jam/packages/Haiku | 1 -
build/jam/packages/HaikuBootstrap | 1 -
----------------------------------------------------------------------------
diff --git a/Jamfile b/Jamfile
index b646406..f14407e 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 3e5de17..e2a672e 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 bf75bba..2158757 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 <bin>install installsound iroster isvolume
ideinfo@ide idestatus@ide
diff --git a/build/jam/images/HaikuImageBootstrap
b/build/jam/images/HaikuImageBootstrap
index 7d54d16..708486c 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 <bin>install isvolume
ideinfo@ide idestatus@ide
diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index 987f16a..7fcede5 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 9986a60..a017b35 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
Other related posts:
- » [haiku-commits] haiku: hrev46929 - in build/jam: images packages - korli
