From ee71768be65a30f2de6b206916f533a13309d604 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 13 May 2011 15:36:25 +0000 Subject: [PATCH] Added gcc4 taglib optionalpackage git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41474 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 9a5e3c8a8a..59771d417d 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -1469,14 +1469,14 @@ if [ IsOptionalHaikuImagePackageAdded Subversion ] { if [ IsOptionalHaikuImagePackageAdded TagLib ] { if $(TARGET_ARCH) != x86 { Echo "No optional package TagLib available for $(TARGET_ARCH)" ; + } else if $(HAIKU_GCC_VERSION[1]) >= 4 { + InstallOptionalHaikuImagePackage + taglib-1.6.3-x86-gcc4-2011-05-13.zip + : $(baseURL)/taglib-1.6.3-x86-gcc4-2011-05-13.zip ; } else { - if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { - Echo "No optional package TagLib available for $(TARGET_ARCH)-gcc4" ; - } else { - InstallOptionalHaikuImagePackage - taglib-1.6.3-r1a2-x86-gcc2-2010-04-25.zip - : $(baseURL)/taglib-1.6.3-r1a2-x86-gcc2-2010-04-25.zip ; - } + InstallOptionalHaikuImagePackage + taglib-1.6.3-r1a2-x86-gcc2-2010-04-25.zip + : $(baseURL)/taglib-1.6.3-r1a2-x86-gcc2-2010-04-25.zip ; } }