Ticket #41568: patch-boost.diff

Portfile

@@ -178 +178 @@
     set v [string index ${s} 0].[string index ${s} 1]
     set i [lsearch -exact ${pythons_ports} ${p}]
     set c [lreplace ${pythons_ports} ${i} ${i}]
-    # patch for boost.python from
-    # https://raw.github.com/archlinuxarm/PKGBUILDs/master/extra/boost/boost-1.53.0-python3.patch
-    # see also https://svn.boost.org/trac/boost/ticket/4657)
     if { ${s} > 30 } { set bppatch "patch-boost-python3.diff" } else { set bppatch "" }
     eval [subst {
         variant ${p} description "Build Boost.Python for Python ${v}" conflicts ${c} debug {

files/patch-boost-python3.diff

@@ -12 +12 @@
  namespace boost { namespace mpi { namespace python {
  
  void export_datatypes()
-diff -Naur libs/mpi/src/python/py_environment.cpp libs/mpi/src/python/py_environment.cpp
---- libs/mpi/src/python/py_environment.cpp      2007-11-25 13:38:02.000000000 -0500
-+++ libs/mpi/src/python/py_environment.cpp      2013-03-11 21:02:12.961737401 -0400
-@@ -11,6 +11,9 @@
-  *  This file reflects the Boost.MPI "environment" class into Python
-  *  methods at module level.
-  */
-+
-+#include <locale>
-+#include <string>
- #include <boost/python.hpp>
- #include <boost/mpi.hpp>
- 
-@@ -50,11 +53,65 @@
- 
-   // If anything changed, convert C-style argc/argv into Python argv
-   if (mpi_argv != my_argv)
-+  {
-+#if PY_MAJOR_VERSION >= 3
-+    // Code stolen from py3k/Modules/python.c.
-+
-+    wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
-+    /* We need a second copies, as Python might modify the first one. */
-+    wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
-+
-+    if (!argv_copy || !argv_copy2) {
-+      fprintf(stderr, "out of memory\n");
-+      return false;
-+    }
-+
-+    std::locale mylocale;
-+    mbstate_t mystate;
-+
-+    const std::codecvt<char, wchar_t, mbstate_t>& myfacet =
-+      std::use_facet<std::codecvt<char, wchar_t, mbstate_t> >(mylocale);
-+
-+    for (int i = 0; i < mpi_argc; i++) 
-+    {
-+      size_t length = strlen(mpi_argv[i]);
-+
-+      wchar_t *dest = (wchar_t *) PyMem_Malloc(sizeof(wchar_t) * (length + 1));
-+
-+      const char *from_next;
-+      wchar_t *to_next;
-+
-+      std::codecvt<wchar_t,char,mbstate_t>::result myresult = 
-+        myfacet.out(mystate,
-+            mpi_argv[i], mpi_argv[i] + length + 1, from_next,
-+            dest, dest+length+1, to_next);
-+
-+      if (myresult != std::codecvt<wchar_t,char,mbstate_t>::ok )
-+      {
-+        fprintf(stderr, "failure translating argv\n");
-+        return 1;
-+      }
-+
-+      argv_copy2[i] = argv_copy[i] = dest;
-+      if (!argv_copy[i])
-+          return false;
-+    }
-+
-+    PySys_SetArgv(mpi_argc, argv_copy);
-+
-+    for (int i = 0; i < mpi_argc; i++) {
-+        PyMem_Free(argv_copy2[i]);
-+    }
-+    PyMem_Free(argv_copy);
-+    PyMem_Free(argv_copy2);
-+#else
-     PySys_SetArgv(mpi_argc, mpi_argv);
-+#endif
-+  }
- 
--  for (int arg = 0; arg < my_argc; ++arg)
--    free(my_argv[arg]);
--  delete [] my_argv;
-+  for (int arg = 0; arg < mpi_argc; ++arg)
-+    free(mpi_argv[arg]);
-+  delete [] mpi_argv;
- 
-   return true;
- }
+diff -Naur libs/mpi/build/__init__.py llibs/mpi/build/__init__.py
+--- libs/mpi/build/__init__.py  2013-11-27 12:52:37.000000000 -0600
++++ libs/mpi/build/__init__.py  2013-11-27 12:52:55.000000000 -0600
+@@ -6,5 +6,5 @@
+     import mpi
+     sys.setdlopenflags(flags)
+ else:
+-    import mpi
++    from . import mpi