[60830] trunk/dports/devel/boost

[nox at macports.org]

Revision: 60830
          http://trac.macports.org/changeset/60830
Author:   nox at macports.org
Date:     2009-11-25 03:25:57 -0800 (Wed, 25 Nov 2009)
Log Message:
-----------
boost:
 * Remove patch-tools-build-v2-tools-gcc.jam.diff (closes #22609).
 * Add include guards in mapped_file.hpp (closes #22631).
 * Remove `_GLIBCXX_DEBUG` from debug variant (closes #22112).
 * Add a patch to avoid linking with system's Python.

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

Added Paths:
-----------
    trunk/dports/devel/boost/files/patch-boost-iostreams-device-mapped_file.hpp.diff
    trunk/dports/devel/boost/files/patch-tools-build-v2-tools-python.jam.diff

Removed Paths:
-------------
    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-11-25 11:24:53 UTC (rev 60829)
+++ trunk/dports/devel/boost/Portfile	2009-11-25 11:25:57 UTC (rev 60830)
@@ -5,6 +5,7 @@
 
 name            boost
 version         1.41.0
+revision        1
 categories      devel
 platforms       darwin
 maintainers     nox openmaintainer
@@ -24,7 +25,8 @@
                     sha1    31134e28866b90c39ca4a903c263e036bb25550c \
                     rmd160  a604ef5a6f6f5bf50be59206c8534258ab431aea
 
-patchfiles      patch-libs-random-random_device.cpp.diff
+patchfiles      patch-boost-iostreams-device-mapped_file.hpp.diff \
+                patch-libs-random-random_device.cpp.diff
 
 post-extract {
     file mkdir ${worksrcpath}/libs/random/build
@@ -108,6 +110,12 @@
     set c [lreplace ${pythons_ports} ${i} ${i}]
     eval [subst {
         variant ${p} description "Build Boost.Python for Python ${v}" conflicts ${c} {
+            patchfiles-append   patch-tools-build-v2-tools-python.jam.diff
+
+            post-patch {
+                reinplace s|@PREFIX@|${prefix}| ${worksrcpath}/tools/build/v2/tools/python.jam
+            }
+
             depends_lib-append  port:${p}
             build.args-delete   --without-python
 
@@ -156,7 +164,7 @@
 }
 
 variant debug description {Build debug libraries} {
-    build.args-append   variant=debug,release define=_GLIBCXX_DEBUG
+    build.args-append   variant=debug,release
 }
 
 variant doc description {Install documentation} {
@@ -186,8 +194,6 @@
 variant universal {
     build.args-append   pch=off
 
-    patchfiles-append   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-boost-iostreams-device-mapped_file.hpp.diff
===================================================================
--- trunk/dports/devel/boost/files/patch-boost-iostreams-device-mapped_file.hpp.diff	                        (rev 0)
+++ trunk/dports/devel/boost/files/patch-boost-iostreams-device-mapped_file.hpp.diff	2009-11-25 11:25:57 UTC (rev 60830)
@@ -0,0 +1,18 @@
+--- boost/iostreams/device/mapped_file.hpp
++++ boost/iostreams/device/mapped_file.hpp
+@@ -4,6 +4,9 @@
+ // Distributed under the Boost Software License, Version 1.0. (See accompanying
+ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt.)
+ 
++#ifndef BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED
++#define BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED
++
+ #if defined(_MSC_VER) && (_MSC_VER >= 1020)
+ # pragma once
+ #endif
+@@ -591,3 +594,5 @@ operator^=(mapped_file::mapmode& a, mapped_file::mapmode b)
+ } } // End namespaces iostreams, boost.
+ 
+ #include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
++
++#endif // #ifndef BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED

Deleted: 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	2009-11-25 11:24:53 UTC (rev 60829)
+++ trunk/dports/devel/boost/files/patch-tools-build-v2-tools-gcc.jam.diff	2009-11-25 11:25:57 UTC (rev 60830)
@@ -1,11 +0,0 @@
---- 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 ;
-             }

Added: trunk/dports/devel/boost/files/patch-tools-build-v2-tools-python.jam.diff
===================================================================
--- trunk/dports/devel/boost/files/patch-tools-build-v2-tools-python.jam.diff	                        (rev 0)
+++ trunk/dports/devel/boost/files/patch-tools-build-v2-tools-python.jam.diff	2009-11-25 11:25:57 UTC (rev 60830)
@@ -0,0 +1,11 @@
+--- tools/build/v2/tools/python.jam.orig	2009-10-06 15:56:18.000000000 +0200
++++ tools/build/v2/tools/python.jam	2009-10-06 15:53:48.000000000 +0200
+@@ -427,7 +427,7 @@
+     version ?= $(.version-countdown) ;
+ 
+     local prefix
+-      = [ GLOB /System/Library/Frameworks /Library/Frameworks
++      = [ GLOB @PREFIX@/Library/Frameworks
+           : Python.framework ] ;
+ 
+     return $(prefix)/Versions/$(version)/bin/python ;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091125/ae2139c9/attachment.html>