<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a19e15516ade03814abae911c876739b1327fc73">https://github.com/macports/macports-ports/commit/a19e15516ade03814abae911c876739b1327fc73</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a19e155 openvdb: use correct library location for Python 2.7
</span>a19e155 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a19e15516ade03814abae911c876739b1327fc73
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Feb 1 05:51:25 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> openvdb: use correct library location for Python 2.7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since port either builds correctly or not at all.
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/57987
</span>---
graphics/openvdb/Portfile | 12 +++++++++---
graphics/openvdb/files/patch-boost_python_libs.diff | 6 +++---
graphics/openvdb/files/patch-boost_python_name.diff | 12 ++++++++----
graphics/openvdb/files/patch-no_ccache.diff | 14 +++++---------
graphics/openvdb/files/patch-python_cxx11.diff | 10 +++++-----
5 files changed, 30 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openvdb/Portfile b/graphics/openvdb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2472fb8..17a473b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openvdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openvdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +60,9 @@ variant python27 description {Build the Python 2.7 bindings} conflicts python36
</span> port:python27 \
port:py27-numpy
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/2.7/Python \
</span> -DPYOPENVDB_INSTALL_DIRECTORY=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7
require_active_variants boost python27
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +72,9 @@ variant python36 description {Build the Python 3.6 bindings} conflicts python27
</span> port:python36 \
port:py36-numpy
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/bin/python3.6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/3.6/bin/python3.6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/3.6/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/3.6/Python \
</span> -DPYOPENVDB_INSTALL_DIRECTORY=${frameworks_dir}/Python.framework/Versions/3.6/lib/python3.6
require_active_variants boost python36
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +84,9 @@ variant python37 description {Build the Python 3.7 bindings} conflicts python27
</span> port:python37 \
port:py37-numpy
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/bin/python3.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/3.7/bin/python3.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/3.7/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/3.7/Python \
</span> -DPYOPENVDB_INSTALL_DIRECTORY=${frameworks_dir}/Python.framework/Versions/3.7/lib/python3.7
require_active_variants boost python37
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openvdb/files/patch-boost_python_libs.diff b/graphics/openvdb/files/patch-boost_python_libs.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 21594e2..99c7ebc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openvdb/files/patch-boost_python_libs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openvdb/files/patch-boost_python_libs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- openvdb/python/CMakeLists.txt.orig 2018-12-16 09:54:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ openvdb/python/CMakeLists.txt 2018-12-16 10:02:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,7 +90,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- openvdb/python/CMakeLists.txt.orig 2019-02-01 04:59:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ openvdb/python/CMakeLists.txt 2019-02-01 04:59:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,7 +94,7 @@
</span> ${GLFW_LINK_LIBRARY}
${GLFW_DEPENDENT_LIBRARIES}
${GLEW_GLEW_LIBRARY}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openvdb/files/patch-boost_python_name.diff b/graphics/openvdb/files/patch-boost_python_name.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7fd2edd..7f5faeb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openvdb/files/patch-boost_python_name.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openvdb/files/patch-boost_python_name.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- openvdb/python/CMakeLists.txt.orig 2018-08-13 08:33:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ openvdb/python/CMakeLists.txt 2018-12-16 09:34:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,7 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- openvdb/python/CMakeLists.txt.orig 2018-12-18 05:27:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ openvdb/python/CMakeLists.txt 2019-02-01 04:52:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,7 +3,11 @@
</span>
FIND_PACKAGE ( PythonInterp REQUIRED )
FIND_PACKAGE ( PythonLibs REQUIRED )
-FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${PYTHON_VERSION_MAJOR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++IF ( PYTHON_VERSION_MAJOR GREATER 2 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${PYTHON_VERSION_MAJOR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ELSE ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ENDIF ()
</span>
IF ( NOT OPENVDB_BUILD_CORE )
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openvdb/files/patch-no_ccache.diff b/graphics/openvdb/files/patch-no_ccache.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 323fcde..0309f20 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openvdb/files/patch-no_ccache.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openvdb/files/patch-no_ccache.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2018-08-13 08:33:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2018-12-16 09:44:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,11 +32,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2018-12-18 05:27:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2019-02-01 04:55:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,12 +32,6 @@
</span>
ENABLE_TESTING()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,11 +9,7 @@
</span> - set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
- set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-endif(CCACHE_FOUND)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#find_program(CCACHE_FOUND ccache)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if(CCACHE_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif(CCACHE_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> OPTION ( OPENVDB_BUILD_UNITTESTS "Build the OpenVDB unit tests" ON )
OPTION ( OPENVDB_BUILD_DOCS "Build the OpenVDB documentation" OFF )
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTION ( OPENVDB_BUILD_PYTHON_MODULE "Build the pyopenvdb Python module" ON )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openvdb/files/patch-python_cxx11.diff b/graphics/openvdb/files/patch-python_cxx11.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 28a5c93..3a8485b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openvdb/files/patch-python_cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openvdb/files/patch-python_cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- openvdb/python/CMakeLists.txt.orig 2018-12-16 09:45:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ openvdb/python/CMakeLists.txt 2018-12-16 09:53:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,6 +5,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FIND_PACKAGE ( PythonLibs REQUIRED )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${PYTHON_VERSION_MAJOR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- openvdb/python/CMakeLists.txt.orig 2019-02-01 04:57:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ openvdb/python/CMakeLists.txt 2019-02-01 04:57:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,6 +9,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF ()
</span>
+set(CMAKE_CXX_STANDARD 11)
</pre><pre style='margin:0'>
</pre>