[78181] trunk/dports/devel/boost

adfernandes at macports.org adfernandes at macports.org
Wed Apr 27 09:35:04 PDT 2011


Revision: 78181
          http://trac.macports.org/changeset/78181
Author:   adfernandes at macports.org
Date:     2011-04-27 09:35:03 -0700 (Wed, 27 Apr 2011)
Log Message:
-----------
devel/boost: apply compat patches for python32 as per #29097

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

Added Paths:
-----------
    trunk/dports/devel/boost/files/patch-libs-python-src-converter-builtin_converters.cpp
    trunk/dports/devel/boost/files/patch-tools-build-v2-tools-python-2.jam.diff

Modified: trunk/dports/devel/boost/Portfile
===================================================================
--- trunk/dports/devel/boost/Portfile	2011-04-27 16:10:44 UTC (rev 78180)
+++ trunk/dports/devel/boost/Portfile	2011-04-27 16:35:03 UTC (rev 78181)
@@ -157,8 +157,14 @@
             configure.args-delete   --without-libraries=python
             configure.args-append   --with-python=${prefix}/bin/python${v}
             
-            patchfiles-append   patch-tools-build-v2-tools-python.jam.diff
+            patchfiles-append   patch-tools-build-v2-tools-python.jam.diff \
+                                patch-tools-build-v2-tools-python-2.jam.diff
             
+            # As per https://trac.macports.org/ticket/29097 and https://svn.boost.org/trac/boost/ticket/4994,
+            # apply https://svn.boost.org/trac/boost/changeset/71050 to boost-1.46.1
+            #
+            patchfiles-append   patch-libs-python-src-converter-builtin_converters.cpp
+            
             post-patch {
                 reinplace s|@PREFIX@|${prefix}| ${worksrcpath}/tools/build/v2/tools/python.jam
             }

Added: trunk/dports/devel/boost/files/patch-libs-python-src-converter-builtin_converters.cpp
===================================================================
--- trunk/dports/devel/boost/files/patch-libs-python-src-converter-builtin_converters.cpp	                        (rev 0)
+++ trunk/dports/devel/boost/files/patch-libs-python-src-converter-builtin_converters.cpp	2011-04-27 16:35:03 UTC (rev 78181)
@@ -0,0 +1,12 @@
+--- libs/python/src/converter/builtin_converters.cpp	(revision 56305)
++++ libs/python/src/converter/builtin_converters.cpp	(revision 71050)
+@@ -432,5 +432,8 @@
+           {
+               int err = PyUnicode_AsWideChar(
+-                  (PyUnicodeObject *)intermediate
++#if PY_VERSION_HEX < 0x03020000
++                  (PyUnicodeObject *)
++#endif
++                    intermediate
+                 , &result[0]
+                 , result.size());


Property changes on: trunk/dports/devel/boost/files/patch-libs-python-src-converter-builtin_converters.cpp
___________________________________________________________________
Added: svn:keywords
   + Date Revision Author URL Id
Added: svn:eol-style
   + native

Added: trunk/dports/devel/boost/files/patch-tools-build-v2-tools-python-2.jam.diff
===================================================================
--- trunk/dports/devel/boost/files/patch-tools-build-v2-tools-python-2.jam.diff	                        (rev 0)
+++ trunk/dports/devel/boost/files/patch-tools-build-v2-tools-python-2.jam.diff	2011-04-27 16:35:03 UTC (rev 78181)
@@ -0,0 +1,16 @@
+--- 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
+@@ -546,6 +546,13 @@
+         libraries ?= $(default-library-path) ;
+         includes ?= $(default-include-path) ;
+     }
++    else if $(target-os) = darwin
++    {
++        includes ?= $(prefix)/Headers ;
++
++        local lib = $(exec-prefix)/lib ;
++        libraries ?= $(lib)/python$(version)/config $(lib) ;
++    }
+     else
+     {
+         includes ?= $(prefix)/include/python$(version) ;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110427/5926d9c6/attachment.html>


More information about the macports-changes mailing list