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

Updated libtool build to use sed at it's new location. Add LibIconv as a dependency for git.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36083 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Scott McCreary
2010-04-08 14:54:00 +00:00
parent 0660612cdb
commit c5a3a6bba8
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackageDependencies
+2 -1
View File
@@ -1,3 +1,4 @@
# package dependencies # package dependencies
# #
# For transitive dependencies dependants should be listed before their # For transitive dependencies dependants should be listed before their
@@ -15,7 +16,7 @@ OptionalPackageDependencies NetSurf : OpenSSL Curl LibXML2 LibIconv ;
OptionalPackageDependencies OpenSSH : OpenSSL ; OptionalPackageDependencies OpenSSH : OpenSSL ;
OptionalPackageDependencies Python : Bzip ; OptionalPackageDependencies Python : Bzip ;
OptionalPackageDependencies Mercurial : Python ; OptionalPackageDependencies Mercurial : Python ;
OptionalPackageDependencies Git : Expat Curl OpenSSL ; OptionalPackageDependencies Git : Expat Curl OpenSSL LibIconv ;
OptionalPackageDependencies Curl : OpenSSL ; OptionalPackageDependencies Curl : OpenSSL ;
OptionalPackageDependencies MandatoryPackages : Sed Tar ; OptionalPackageDependencies MandatoryPackages : Sed Tar ;
OptionalPackageDependencies NetFS : UserlandFS ; OptionalPackageDependencies NetFS : UserlandFS ;
build/jam/OptionalPackages
+2 -2
View File
@@ -388,8 +388,8 @@ if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 {
: $(baseURL)/automake-1.11.1-x86-gcc2-2009-12-23.zip : $(baseURL)/automake-1.11.1-x86-gcc2-2009-12-23.zip
: :
: true ; : true ;
InstallOptionalHaikuImagePackage libtool-2.2.6b-x86-gcc2-2009-11-18.zip InstallOptionalHaikuImagePackage libtool-2.2.6b-x86-gcc2-2010-04-08.zip
: $(baseURL)/libtool-2.2.6b-x86-gcc2-2009-11-18.zip : $(baseURL)/libtool-2.2.6b-x86-gcc2-2010-04-08.zip
: :
: true ; : true ;
InstallOptionalHaikuImagePackage texinfo-4.13a-r1a1-x86-gcc2-2009-08-30.zip InstallOptionalHaikuImagePackage texinfo-4.13a-r1a1-x86-gcc2-2009-08-30.zip