From 6a2bdc9b4ae01a97ad32c6b589724e7b732c0e7d Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 1 Oct 2008 22:52:48 +0000 Subject: [PATCH] Changes by Scott McCreary: * Updated CVS optional package to version 1.12.13. * Added Yasm 0.7.1 optional package. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27836 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 10d3640c88..90b0867eaf 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -28,6 +28,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) { # Vision # VLC # WonderBrush +# Yasm # package dependencies @@ -127,8 +128,8 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] { Echo "No optional package CVS available for gcc4" ; } else { local baseURL = http://haiku-files.org/files/optional-packages ; - InstallOptionalHaikuImagePackage cvs-1.11.21-gcc2-2008-07-23 - : $(baseURL)/cvs-1.11.21-gcc2-2008-07-23.zip + InstallOptionalHaikuImagePackage cvs-1.12.13-gcc2-2008-09-30 + : $(baseURL)/cvs-1.12.13-gcc2-2008-09-30.zip : ; } @@ -429,4 +430,17 @@ if [ IsOptionalHaikuImagePackageAdded WonderBrush ] { } } - +# Yasm +if [ IsOptionalHaikuImagePackageAdded Yasm ] { + if $(TARGET_ARCH) != x86 { + Echo "No optional package Yasm available for $(TARGET_ARCH)" ; + } else if $(HAIKU_GCC_VERSION[1]) >= 4 && $(isHybridBuild) = 0 { + Echo "No optional package Yasm available for gcc4" ; + } else { + local baseURL = http://haiku-files.org/files/optional-packages ; + InstallOptionalHaikuImagePackage yasm-0.7.1-gcc2-2008-10-01 + : $(baseURL)/yasm-0.7.1-gcc2-2008-10-01.zip + : + ; + } +}