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

* added new optional package for gcc4 and flex, both of which no

Browse Source 
longer require libiconv
* removed libiconv from dependencies of DevelopmentMin, as this is
  no longer true


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32479 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2009-08-17 19:27:30 +00:00
parent 203116954e
commit 5c31e9b97f
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackageDependencies
-1
View File
@@ -8,7 +8,6 @@ OptionalPackageDependencies APR-util : APR ;
OptionalPackageDependencies BeHappy : BeBook NetSurf ; OptionalPackageDependencies BeHappy : BeBook NetSurf ;
OptionalPackageDependencies Development : DevelopmentBase Perl ; OptionalPackageDependencies Development : DevelopmentBase Perl ;
OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ; OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
OptionalPackageDependencies DevelopmentMin : LibIconv ;
OptionalPackageDependencies Firefox : LibIconv ; OptionalPackageDependencies Firefox : LibIconv ;
OptionalPackageDependencies LibLayout : DevelopmentBase ; OptionalPackageDependencies LibLayout : DevelopmentBase ;
OptionalPackageDependencies NetSurf : OpenSSL ; OptionalPackageDependencies NetSurf : OpenSSL ;
build/jam/OptionalPackages
+4 -4
View File
@@ -274,8 +274,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
} }
if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) { if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) {
InstallOptionalHaikuImagePackage gcc-4.3.3-x86-gcc4-2009-06-29-1 InstallOptionalHaikuImagePackage gcc-4.3.3-x86-gcc4-2009-06-29-2
: $(baseURL)/gcc-4.3.3-x86-gcc4-2009-06-29-1.zip ; : $(baseURL)/gcc-4.3.3-x86-gcc4-2009-06-29-2.zip ;
# symlink cpp to g++'s headers # symlink cpp to g++'s headers
AddSymlinkToHaikuImage develop abi x86 gcc4 headers AddSymlinkToHaikuImage develop abi x86 gcc4 headers
@@ -287,8 +287,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
: $(baseURL)/bison-2.4.1-x86-gcc2-2009-07-05.zip ; : $(baseURL)/bison-2.4.1-x86-gcc2-2009-07-05.zip ;
InstallOptionalHaikuImagePackage m4-1.4.12-gcc2-2008-11-04 InstallOptionalHaikuImagePackage m4-1.4.12-gcc2-2008-11-04
: $(baseURL)/m4-1.4.12-gcc2-2008-11-04.zip ; : $(baseURL)/m4-1.4.12-gcc2-2008-11-04.zip ;
InstallOptionalHaikuImagePackage flex-2.5.35-x86-gcc2-2009-07-05 InstallOptionalHaikuImagePackage flex-2.5.35-x86-gcc2-2009-08-17
: $(baseURL)/flex-2.5.35-x86-gcc2-2009-07-05.zip ; : $(baseURL)/flex-2.5.35-x86-gcc2-2009-08-17.zip ;
InstallOptionalHaikuImagePackage jam-2.5-x86-gcc2-2009-05-26 InstallOptionalHaikuImagePackage jam-2.5-x86-gcc2-2009-05-26
: $(baseURL)/jam-2.5-x86-gcc2-2009-05-26.zip ; : $(baseURL)/jam-2.5-x86-gcc2-2009-05-26.zip ;