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

  • From: kallisti5@xxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 23 Nov 2013 19:32:48 +0100 (CET)

hrev46424 adds 1 changeset to branch 'master'
old head: bae76b378341cea1374dbf3d2d61a24a1b5753e2
new head: 29996a0199d6ff4acfd2c3247634c2262cf7fef1
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=29996a0+%5Ebae76b3

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

29996a0: build: Disable WebPositive on x86_64 to fix build
  
  * This commit is temporary and should be reverted
    when the x86_64 build is fixed.

                          [ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]

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

Revision:    hrev46424
Commit:      29996a0199d6ff4acfd2c3247634c2262cf7fef1
URL:         http://cgit.haiku-os.org/haiku/commit/?id=29996a0
Author:      Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date:        Sat Nov 23 18:32:36 2013 UTC

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

1 file changed, 12 insertions(+), 2 deletions(-)
build/jam/DefaultBuildProfiles | 14 ++++++++++++--

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

diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles
index 8c91bd2..bf5ebe2 100644
--- a/build/jam/DefaultBuildProfiles
+++ b/build/jam/DefaultBuildProfiles
@@ -71,8 +71,13 @@ rule DefineDefaultBuildProfiles
                                }
                        }
 
-                       AddOptionalHaikuImagePackages BeBook Development Git 
WebPositive
+                       AddOptionalHaikuImagePackages BeBook Development Git
                                Welcome ;
+
+                       # Temporary until WebPositive is fixed on x86_64
+            if $(HAIKU_PACKAGING_ARCHS) != x86_64 {
+                               AddHaikuImagePackages WebPositive ;
+                       }
                }
 
                case "alpha-*" : {
@@ -99,7 +104,12 @@ rule DefineDefaultBuildProfiles
                                xz_utils
                                ;
 
-                       AddOptionalHaikuImagePackages Development Git 
WebPositive ;
+                       AddOptionalHaikuImagePackages Development Git ;
+
+                       # Temporary until WebPositive is fixed on x86_64
+            if $(HAIKU_PACKAGING_ARCHS) != x86_64 {
+                               AddHaikuImagePackages WebPositive ;
+                       }
                }
 
                case "bootstrap-*" : {


Other related posts: