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

Added Grep utility to the OptionalPackages

Browse Source 
Signed-off-by: Jérôme Duval <[email protected]>
This commit is contained in:
Gleb Posobin
2012-12-28 19:58:34 +01:00
committed by Jérôme Duval
parent d1f280c805
commit 9d2f78ca74
203 changed files with 25 additions and 71744 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/Haiku64Image
+1 -3
View File
@@ -10,7 +10,7 @@ SYSTEM_BIN = "[" addattr base64 basename bash beep cal cat catattr checkfs
chgrp chmod chown chroot cksum clear clockconfig cmp collectcatkeys comm
compress copyattr cp csplit cut date dd diff diff3 dircolors dirname df du
dumpcatalog echo eject env error expand expr factor false find finddir
fmt fold fortune ftp gawk gdb gzip gzexe getlimits grep groups head hostname
fmt fold fortune ftp gawk gdb gzip gzexe getlimits groups head hostname
id ifconfig <bin>install isvolume join kernel_debugger kill less lessecho
lesskey link linkcatkeys listdev ln locale locate logger logname ls
makebootable md5sum mimeset mkdir mkfifo mkfs mktemp mount mountvolume
@@ -228,8 +228,6 @@ AddSymlinkToHaikuImage system bin : gzip : zcat ;
AddSymlinkToHaikuImage system bin : zdiff : zcmp ;
AddSymlinkToHaikuImage system bin : unzip : zipinfo ;
AddSymlinkToHaikuImage system bin : gawk : awk ;
AddSymlinkToHaikuImage system bin : grep : egrep ;
AddSymlinkToHaikuImage system bin : grep : fgrep ;
# scripts and data files
build/jam/HaikuImage
+1 -3
View File
@@ -12,7 +12,7 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
echo eject env error expand expr
factor false fdinfo ffm filepanel find finddir fmt fold fortune frcode
ftp ftpd funzip fwcontrol
gawk gdb@x86 getlimits grep groups gzip gzexe
gawk gdb@x86 getlimits groups gzip gzexe
hd head hey hostname
id ident ifconfig <bin>install installsound iroster isvolume
ideinfo@ide idestatus@ide
@@ -440,8 +440,6 @@ AddSymlinkToHaikuImage system bin : gzip : zcat ;
AddSymlinkToHaikuImage system bin : zdiff : zcmp ;
AddSymlinkToHaikuImage system bin : unzip : zipinfo ;
AddSymlinkToHaikuImage system bin : gawk : awk ;
AddSymlinkToHaikuImage system bin : grep : egrep ;
AddSymlinkToHaikuImage system bin : grep : fgrep ;
# scripts and data files
build/jam/OptionalPackageDependencies
+1 -1
View File
@@ -41,4 +41,4 @@ OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite WebKit WebPositive
OptionalPackageDependencies wpa_supplicant : OpenSSL ;
OptionalPackageDependencies XZ-Utils : Tar ;
OptionalPackageDependencies MandatoryPackages : Bzip Ctags ICU Sed Tar ;
OptionalPackageDependencies MandatoryPackages : Bzip Ctags Grep ICU Sed Tar ;
build/jam/OptionalPackages
+22
View File
@@ -53,6 +53,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
# Git - the distributed version control system
# GitDoc - documentation for the distributed version control system
# GPerf - the perfect hash function generator.
# Grep - program to search for strings inside a file
# Groff - text formatter used for man pages
# HGrep - header grep tool
# ICU-devel - the headers and lib-links for ICU (for development)
@@ -1225,6 +1226,27 @@ if [ IsOptionalHaikuImagePackageAdded Groff ] {
}
}
# Grep
if [ IsOptionalHaikuImagePackageAdded Grep ] {
if $(TARGET_ARCH) = x86 {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
grep-2.14-x86-gcc4-2012-12-28.zip
: $(baseURL)/grep-2.14-x86-gcc4-2012-12-28.zip ;
} else {
InstallOptionalHaikuImagePackage
grep-2.14-x86-gcc2-2012-12-28.zip
: $(baseURL)/grep-2.14-x86-gcc2-2012-12-28.zip ;
}
} else if $(TARGET_ARCH) = x86_64 {
InstallOptionalHaikuImagePackage
grep-2.14-x86_64-2012-12-28.zip
: $(baseURL)/grep-2.14-x86_64-2012-12-28.zip
: : true ;
} else {
Echo "No optional package Grep available for $(TARGET_ARCH)" ;
}
}
# HGgrep
if [ IsOptionalHaikuImagePackageAdded HGrep ] {