[58424] trunk/dports/devel/boost

[nox at macports.org]

Revision: 58424
          http://trac.macports.org/changeset/58424
Author:   nox at macports.org
Date:     2009-09-28 09:25:38 -0700 (Mon, 28 Sep 2009)
Log Message:
-----------
boost: Fix universal on Snow Leopard (closes #21408).

Modified Paths:
--------------
    trunk/dports/devel/boost/Portfile

Added Paths:
-----------
    trunk/dports/devel/boost/files/patch-tools-build-v2-tools-darwin.jam.diff
    trunk/dports/devel/boost/files/patch-tools-build-v2-tools-gcc.jam.diff

Modified: trunk/dports/devel/boost/Portfile
===================================================================
--- trunk/dports/devel/boost/Portfile	2009-09-28 16:05:32 UTC (rev 58423)
+++ trunk/dports/devel/boost/Portfile	2009-09-28 16:25:38 UTC (rev 58424)
@@ -185,6 +185,12 @@
 }
 
 variant universal {
+    if {${os.major} == 10} {
+        patchfiles-append \
+            patch-tools-build-v2-tools-darwin.jam.diff \
+            patch-tools-build-v2-tools-gcc.jam.diff
+    }
+
     if {[lsearch ${universal_archs} ppc*] != -1} {
         if {[lsearch ${universal_archs} *86*] != -1} {
             build.args-append   architecture=combined

Added: trunk/dports/devel/boost/files/patch-tools-build-v2-tools-darwin.jam.diff
===================================================================
--- trunk/dports/devel/boost/files/patch-tools-build-v2-tools-darwin.jam.diff	                        (rev 0)
+++ trunk/dports/devel/boost/files/patch-tools-build-v2-tools-darwin.jam.diff	2009-09-28 16:25:38 UTC (rev 58424)
@@ -0,0 +1,22 @@
+--- tools/build/v2/tools/darwin.jam.orig	2009-09-28 16:38:09.000000000 +0200
++++ tools/build/v2/tools/darwin.jam	2009-09-28 16:39:53.000000000 +0200
+@@ -305,16 +305,15 @@
+ }
+ 
+ arch-addr-flags darwin OPTIONS : combined : 32 : -arch i386 -arch ppc : default ;
+-arch-addr-flags darwin OPTIONS : combined : 64 : -arch x86_64 -arch ppc64 ;
+-arch-addr-flags darwin OPTIONS : combined : 32_64 : -arch i386 -arch ppc -arch x86_64 -arch ppc64 ;
++arch-addr-flags darwin OPTIONS : combined : 64 : -arch x86_64 ;
++arch-addr-flags darwin OPTIONS : combined : 32_64 : -arch i386 -arch ppc -arch x86_64 ;
+ 
+ arch-addr-flags darwin OPTIONS : x86 : 32 : -arch i386 : default ;
+ arch-addr-flags darwin OPTIONS : x86 : 64 : -arch x86_64 ;
+ arch-addr-flags darwin OPTIONS : x86 : 32_64 : -arch i386 -arch x86_64 ;
+ 
+ arch-addr-flags darwin OPTIONS : power : 32 : -arch ppc : default ;
+-arch-addr-flags darwin OPTIONS : power : 64 : -arch ppc64 ;
+-arch-addr-flags darwin OPTIONS : power : 32_64 : -arch ppc -arch ppc64 ;
++arch-addr-flags darwin OPTIONS : power : 32_64 : -arch ppc ;
+ 
+ arch-addr-flags darwin OPTIONS : arm : 32 : -arch armv6 : default ;
+ 

Added: trunk/dports/devel/boost/files/patch-tools-build-v2-tools-gcc.jam.diff
===================================================================
--- trunk/dports/devel/boost/files/patch-tools-build-v2-tools-gcc.jam.diff	                        (rev 0)
+++ trunk/dports/devel/boost/files/patch-tools-build-v2-tools-gcc.jam.diff	2009-09-28 16:25:38 UTC (rev 58424)
@@ -0,0 +1,11 @@
+--- tools/build/v2/tools/gcc.jam.orig	2009-09-28 16:44:12.000000000 +0200
++++ tools/build/v2/tools/gcc.jam	2009-09-28 16:45:20.000000000 +0200
+@@ -373,7 +373,7 @@
+             {
+                 option = -m32 ;
+             }
+-            else
++            else if $(model) != 32_64
+             {
+                 option = -m64 ;
+             }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090928/9d0d4534/attachment.html>