From c5a3a6bba803c542f4b32fef65e68270204eab3e Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 8 Apr 2010 14:54:00 +0000 Subject: [PATCH] Updated libtool build to use sed at it's new location. Add LibIconv as a dependency for git. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36083 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackageDependencies | 3 ++- build/jam/OptionalPackages | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies index 2d114f0fcc..aae5178ceb 100644 --- a/build/jam/OptionalPackageDependencies +++ b/build/jam/OptionalPackageDependencies @@ -1,3 +1,4 @@ + # package dependencies # # For transitive dependencies dependants should be listed before their @@ -15,7 +16,7 @@ OptionalPackageDependencies NetSurf : OpenSSL Curl LibXML2 LibIconv ; OptionalPackageDependencies OpenSSH : OpenSSL ; OptionalPackageDependencies Python : Bzip ; OptionalPackageDependencies Mercurial : Python ; -OptionalPackageDependencies Git : Expat Curl OpenSSL ; +OptionalPackageDependencies Git : Expat Curl OpenSSL LibIconv ; OptionalPackageDependencies Curl : OpenSSL ; OptionalPackageDependencies MandatoryPackages : Sed Tar ; OptionalPackageDependencies NetFS : UserlandFS ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 0b3ee996db..b89fd51f58 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -388,8 +388,8 @@ if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 { : $(baseURL)/automake-1.11.1-x86-gcc2-2009-12-23.zip : : true ; - InstallOptionalHaikuImagePackage libtool-2.2.6b-x86-gcc2-2009-11-18.zip - : $(baseURL)/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-2010-04-08.zip : : true ; InstallOptionalHaikuImagePackage texinfo-4.13a-r1a1-x86-gcc2-2009-08-30.zip