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

* reverted the part of 30545 that added the locale kit to the image,

Browse Source 
since it does not build with gcc4

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30551 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2009-05-02 09:27:00 +00:00
parent 80622eee82
commit 04af87bd58
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+6 -13
View File
@@ -29,10 +29,9 @@ if $(HAIKU_ATA_STACK) = 1 {
SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2 SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2
cal cat catattr checkfs chgrp chmod chop chown chroot cksum clear cal cat catattr checkfs chgrp chmod chop chown chroot cksum clear
clockconfig cmp collectcatkeys comm compress copyattr CortexAddOnHost cp clockconfig cmp comm compress copyattr CortexAddOnHost cp
csplit ctags cut date dc dd desklink df diff diff3 dircolors dirname csplit ctags cut date dc dd desklink df diff diff3 dircolors dirname
draggers driveinfo dstcheck du dumpcatalog draggers driveinfo dstcheck du echo eject env error expand expr
echo eject env error expand expr
factor false fdinfo ffm filepanel find finddir fmt fold fortune frcode factor false fdinfo ffm filepanel find finddir fmt fold fortune frcode
ftp ftpd ftp ftpd
funzip fwcontrol funzip fwcontrol
@@ -40,8 +39,7 @@ SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2
id ident ideinfo idestatus ifconfig <bin>install installsound iroster id ident ideinfo idestatus ifconfig <bin>install installsound iroster
isvolume isvolume
join join
keymap kill less lessecho lesskey link linkcatkeys listarea listattr keymap kill less lessecho lesskey link listarea listattr listimage listdev
listimage listdev
listport listres listsem listusb ln locate logger login logname ls lsindex listport listres listsem listusb ln locate logger login logname ls lsindex
makebootable md5sum merge mimeset mkdos mkdir mkfifo mkfs mkindex makebootable md5sum merge mimeset mkdos mkdir mkfifo mkfs mkindex
modifiers mount mount_nfs mountvolume mv modifiers mount mount_nfs mountvolume mv
@@ -70,8 +68,8 @@ SYSTEM_APPS = AboutSystem ActivityMonitor CharacterMap CodyCam DeskCalc DiskProb
StyledEdit Terminal TextSearch TV Workspaces StyledEdit Terminal TextSearch TV Workspaces
; ;
SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations E-mail SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations E-mail
FileTypes Fonts Keyboard Keymap Locale Media Menu Mouse Network Printers FileTypes Fonts Keyboard Keymap Media Menu Mouse Network Printers Screen
Screen ScreenSaver Sounds Time Touchpad <preference>Tracker VirtualMemory ScreenSaver Sounds Time Touchpad <preference>Tracker VirtualMemory
; ;
SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo
GLDirectMode GLTeapot Mandelbrot Pairs GLDirectMode GLTeapot Mandelbrot Pairs
@@ -82,7 +80,7 @@ SYSTEM_LIBS = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so
libmail.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so libmail.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so
libmidi2.so libdevice.so libgame.so libscreensaver.so <revisioned>libroot.so libmidi2.so libdevice.so libgame.so libscreensaver.so <revisioned>libroot.so
libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so
libilmimf.so libiconv.so liblocale.so libilmimf.so libiconv.so
; ;
SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server
net_server media_addon_server input_server app_server fake_app_server net_server media_addon_server input_server app_server fake_app_server
@@ -348,11 +346,6 @@ SEARCH on $(spellFiles)
= [ FDirName $(HAIKU_TOP) src apps mail ] ; = [ FDirName $(HAIKU_TOP) src apps mail ] ;
AddFilesToHaikuImage system etc word_dictionary : $(spellFiles) ; AddFilesToHaikuImage system etc word_dictionary : $(spellFiles) ;
# Locale kit language files
local languageDir = [ FDirName $(HAIKU_TOP) src data etc locale languages ] ;
local languages = [ Glob $(languageDir) : *.language ] ;
AddFilesToHaikuImage system etc locale languages : $(languages) ;
local etcFiles = bash_completion inputrc profile teapot.data ; local etcFiles = bash_completion inputrc profile teapot.data ;
etcFiles = $(etcFiles:G=etc) ; etcFiles = $(etcFiles:G=etc) ;
SEARCH on $(etcFiles) = [ FDirName $(HAIKU_TOP) data etc ] ; SEARCH on $(etcFiles) = [ FDirName $(HAIKU_TOP) data etc ] ;