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

Moved make and mkdepend to OptionalPackages, updated libtool to 2.4.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38813 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Scott McCreary
2010-09-25 16:21:22 +00:00
parent cc3a891e38
commit 5722edeb67
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackages
+6 -7
View File
@@ -489,8 +489,8 @@ if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 {
InstallSourceArchive automake-1.11.1_haiku-2010-04-29.tar.xz InstallSourceArchive automake-1.11.1_haiku-2010-04-29.tar.xz
: $(baseSourceURL)/automake-1.11.1_haiku-2010-04-29.tar.xz : $(baseSourceURL)/automake-1.11.1_haiku-2010-04-29.tar.xz
; ;
InstallOptionalHaikuImagePackage libtool-2.2.10-x86-gcc2-2010-06-10.zip InstallOptionalHaikuImagePackage libtool-2.4-x86-gcc2-2010-09-25.zip
: $(baseURL)/libtool-2.2.10-x86-gcc2-2010-06-10.zip : $(baseURL)/libtool-2.4-x86-gcc2-2010-09-25.zip
: :
: true : true
; ;
@@ -555,6 +555,10 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
: $(baseSourceURL)/flex-2.5.35_haiku-2010-04-29.tar.xz ; : $(baseSourceURL)/flex-2.5.35_haiku-2010-04-29.tar.xz ;
InstallOptionalHaikuImagePackage jam-2.5-r1a2-x86-gcc2-2010-04-21.zip InstallOptionalHaikuImagePackage jam-2.5-r1a2-x86-gcc2-2010-04-21.zip
: $(baseURL)/jam-2.5-r1a2-x86-gcc2-2010-04-21.zip ; : $(baseURL)/jam-2.5-r1a2-x86-gcc2-2010-04-21.zip ;
InstallOptionalHaikuImagePackage mkdepend-1.7-x86-gcc2-2010-09-24.zip
: $(baseURL)/mkdepend-1.7-x86-gcc2-2010-09-24.zip ;
InstallOptionalHaikuImagePackage make-3.82-x86-gcc2-2010-09-25.zip
: $(baseURL)/make-3.82-x86-gcc2-2010-09-25.zip ;
} }
@@ -625,11 +629,6 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
SEARCH on $(scripts) = [ FDirName $(HAIKU_TOP) data bin ] ; SEARCH on $(scripts) = [ FDirName $(HAIKU_TOP) data bin ] ;
AddFilesToHaikuImage system bin : $(scripts) ; AddFilesToHaikuImage system bin : $(scripts) ;
# make and mkdepend build tool, which are part of the Haiku source tree
# TODO: Both should be removed from the tree, made download packages
# and moved to the DevelopmentBase package.
AddFilesToHaikuImage system bin : make mkdepend ;
# skeleton makefile and makefile-engine # skeleton makefile and makefile-engine
local makefileEngineFiles = local makefileEngineFiles =
<makefile-engine>makefile <makefile-engine>makefile