<pre style='margin:0'>
Jeremy Lavergne (nerdling) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9355987a894f1df6ef2b334abaf5d3dffcd6caf9">https://github.com/macports/macports-ports/commit/9355987a894f1df6ef2b334abaf5d3dffcd6caf9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9355987a894f1df6ef2b334abaf5d3dffcd6caf9
</span>Author: Jeremy Lavergne <snc@macports.org>
AuthorDate: Mon Sep 11 18:47:56 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> libftdi1: fix include order during tests
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This is to address the situation where Boost's includes pull in
</span><span style='display:block; white-space:pre;color:#404040;'> an older, already-installed version of libftdi1 that happens to
</span><span style='display:block; white-space:pre;color:#404040;'> be incompatible with the current version's tests.
</span>---
devel/libftdi/Portfile | 6 ++----
devel/libftdi/files/patch-test-CMakeLists.txt.diff | 11 +++++++++++
2 files changed, 13 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libftdi/Portfile b/devel/libftdi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0edff0b..ef7b20d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libftdi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libftdi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,6 @@ subport libftdi0 {
</span>
subport libftdi1 {
PortGroup cmake 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup conflicts_build 1.0
</span>
version 1.4
revision 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,9 +63,8 @@ subport libftdi1 {
</span> sha256 ec36fb49080f834690c24008328a5ef42d3cf584ef4060f3a35aa4681cb31b74
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-python-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts_build libftdi0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-python-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-test-CMakeLists.txt.diff
</span>
cmake.out_of_source yes
configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libftdi/files/patch-test-CMakeLists.txt.diff b/devel/libftdi/files/patch-test-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..60597f5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libftdi/files/patch-test-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/CMakeLists.txt.orig 2017-09-11 18:41:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/CMakeLists.txt 2017-09-11 18:41:11.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,7 +10,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enable_testing()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/src ${Boost_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INCLUDE_DIRECTORIES(AFTER ${CMAKE_SOURCE_DIR}/src ${Boost_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(cpp_tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basic.cpp
</span></pre><pre style='margin:0'>
</pre>