From 9000a31cc187e3f4860bff1299d1d50e8602a075 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 27 May 2011 19:04:46 +0000 Subject: [PATCH] Updated gcc4 build of transmission, added a gcc2 build, and removed gettext dependency for transmission. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41780 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackageDependencies | 2 +- build/jam/OptionalPackages | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies index a75ec3726e..dd5be4f91e 100644 --- a/build/jam/OptionalPackageDependencies +++ b/build/jam/OptionalPackageDependencies @@ -30,7 +30,7 @@ OptionalPackageDependencies Paladin : CCache Fastdep ; OptionalPackageDependencies Pe : PCRE ; OptionalPackageDependencies SDLLibs : XiphLibs libmad libmikmod Libmng libmodplug physfs ; OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 OpenSSL SQLite ; -OptionalPackageDependencies Transmission : LibEvent GetText Curl OpenSSL LibIconv ; +OptionalPackageDependencies Transmission : LibEvent Curl OpenSSL LibIconv ; OptionalPackageDependencies Vim : GetText LibIconv ; OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite ; OptionalPackageDependencies XZ-Utils : Tar ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 14e58f6943..82d028062e 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -1556,13 +1556,16 @@ if [ IsOptionalHaikuImagePackageAdded Transmission ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Transmission available for $(TARGET_ARCH)" ; } else { - if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) { + if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - transmission-2.01-x86-gcc4-2010-07-10.zip - : $(baseURL)/transmission-2.01-x86-gcc4-2010-07-10.zip + transmission-2.21-r1a3-x86-gcc4-2011-05-27.zip + : $(baseURL)/transmission-2.21-r1a3-x86-gcc4-2011-05-27.zip : : true ; } else { - Echo "No optional package Transmission available for $(TARGET_ARCH)-gcc2" ; + InstallOptionalHaikuImagePackage + transmission-2.21-r1a3-x86-gcc2-2011-05-27.zip + : $(baseURL)/transmission-2.21-r1a3-x86-gcc2-2011-05-27.zip + : : true ; } } }