From 280a51c2b88116762ff4f2fe454d5d5861189275 Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Sat, 5 Mar 2011 20:28:30 +0000 Subject: [PATCH] Removed the isCDPackage argument for Curl and SQLite. This allows WebPositive to run on LiveCD (ISO) images again. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40824 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index a3a61da343..ec0e2d6562 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -440,12 +440,10 @@ if [ IsOptionalHaikuImagePackageAdded Curl ] { Echo "No optional package Curl available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage curl-7.21.4-x86-gcc4-2011-02-28.zip - : $(baseURL)/curl-7.21.4-x86-gcc4-2011-02-28.zip - : : true ; + : $(baseURL)/curl-7.21.4-x86-gcc4-2011-02-28.zip ; } else { InstallOptionalHaikuImagePackage curl-7.21.4-x86-gcc2-2011-02-28.zip - : $(baseURL)/curl-7.21.4-x86-gcc2-2011-02-28.zip - : : true ; + : $(baseURL)/curl-7.21.4-x86-gcc2-2011-02-28.zip ; } } @@ -1451,13 +1449,11 @@ if [ IsOptionalHaikuImagePackageAdded SQLite ] { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage sqlite-3.7.5-x86-gcc4-2011-02-28.zip - : $(baseURL)/sqlite-3.7.5-x86-gcc4-2011-02-28.zip - : : true ; + : $(baseURL)/sqlite-3.7.5-x86-gcc4-2011-02-28.zip ; } else { InstallOptionalHaikuImagePackage sqlite-3.7.5-x86-gcc2-2011-02-25.zip - : $(baseURL)/sqlite-3.7.5-x86-gcc2-2011-02-25.zip - : : true ; + : $(baseURL)/sqlite-3.7.5-x86-gcc2-2011-02-25.zip ; } } }