[haiku-commits] haiku: hrev44193 - build/jam

  • From: mattmadia@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 20 May 2012 20:29:18 +0200 (CEST)

hrev44193 adds 1 changeset to branch 'master'
old head: 96e2080d5eacbe392aa2fd54aed8b25a1d4becd1
new head: 87a01ad64e9fcbc0ad0a839e56ef8a857450a72f

----------------------------------------------------------------------------

87a01ad: Added Caya as an optional package.
  
  Provided by Barrett. Fixes #7439.

                                        [ Matt Madia <mattmadia@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev44193
Commit:      87a01ad64e9fcbc0ad0a839e56ef8a857450a72f
URL:         http://cgit.haiku-os.org/haiku/commit/?id=87a01ad
Author:      Matt Madia <mattmadia@xxxxxxxxx>
Date:        Sun May 20 14:31:11 2012 UTC

Ticket:      https://dev.haiku-os.org/ticket/7439

----------------------------------------------------------------------------

1 file changed, 23 insertions(+)
build/jam/OptionalPackages |   23 +++++++++++++++++++++++

----------------------------------------------------------------------------

diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index ffc37cb..c20f5e8 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -28,6 +28,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
 #      Bluetooth                               - experimental Haiku components 
for Bluetooth
 #      BurnItNow                               - CD burning app
 #      Bzip                                    - file archiving utility
+#   Caya                    - a multiprotocol im client
 #      CCache                                  - fast compiler cache
 #      CDRecord                                - the command line CD writing 
tools
 #      Clang                                   - the LLVM C and C++ compiler 
(llvm, libs, headers)
@@ -363,6 +364,28 @@ if [ IsOptionalHaikuImagePackageAdded CARootCertificates ] 
{
 }
 
 
+# Caya
+if [ IsOptionalHaikuImagePackageAdded Caya ] {
+       if $(TARGET_ARCH) != x86 {
+               Echo "No optional package Caya available for $(TARGET_ARCH)" ;
+       } else {
+               if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) {
+                       InstallOptionalHaikuImagePackage
+                               caya-264-x86-gcc4-2012-05-20.zip
+                               : $(baseURL)/caya-264-x86-gcc4-2012-05-20.zip
+                               : : true ;
+                       InstallOptionalHaikuImagePackage
+                               caya-gpl-protocols-35-x86-gcc4-2012-05-20.zip
+                               : 
$(baseURL)/caya-gpl-protocols-35-x86-gcc4-2012-05-20.zip
+                               : : true ;
+                       AddSymlinkToHaikuImage home config be Applications
+                               : /boot/apps/Caya/Caya ;
+               } else {
+                       Echo "No optional package Caya available for 
$(TARGET_ARCH)-gcc2" ;
+               }
+       }
+}
+
 # CCache
 if [ IsOptionalHaikuImagePackageAdded CCache ] {
        if $(TARGET_ARCH) != x86 {


Other related posts:

  • » [haiku-commits] haiku: hrev44193 - build/jam - mattmadia