<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/095865e7812f8ca319b416cb6b9de4dfafe18be1">https://github.com/macports/macports-ports/commit/095865e7812f8ca319b416cb6b9de4dfafe18be1</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 095865e botan: fix building on 10.9
</span>095865e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 095865e7812f8ca319b416cb6b9de4dfafe18be1
</span>Author: Chih-Hsuan Yen <yan12125@macports.org>
AuthorDate: Fri Jun 14 12:45:41 2019 +0800
<span style='display:block; white-space:pre;color:#404040;'> botan: fix building on 10.9
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This was already suggested by RJVB [1] but I forgot to apply it :(
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also includes compiler.fallback to fix building on <= 10.8.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [1] https://github.com/macports/macports-ports/pull/4571#issuecomment-500902085
</span>---
security/botan/Portfile | 7 ++++++-
security/botan/files/patch-map_anon.diff | 13 +++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/botan/Portfile b/security/botan/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e8241e3..3146352 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/botan/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/botan/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,8 @@ depends_lib path:lib/libssl.dylib:openssl port:zlib port:bzip2
</span> # respect MacPorts configure values
patchfiles-append patch-compiler_flags.diff \
patch-fix-install-with-destdir.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-python_exe.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-python_exe.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-map_anon.diff
</span>
post-patch {
reinplace -W ${worksrcpath}/src/build-data/cc \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +44,10 @@ post-patch {
</span>
# botan uses thread_local, which is not supported in Xcode < 8
compiler.blacklist-append {clang < 800}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# XXX: the following line shouldn't be necessary - revisit when refined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compiler selection [1] is available in a stable macports-base version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# [1] https://github.com/macports/macports-base/pull/88
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.fallback-append macports-clang-5.0
</span>
if {[tbool configure.ccache]} {
configure.args-append --cc-bin="${prefix}/bin/ccache ${configure.cxx}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/botan/files/patch-map_anon.diff b/security/botan/files/patch-map_anon.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6e05b67
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/botan/files/patch-map_anon.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/lib/utils/os_utils.cpp src/lib/utils/os_utils.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f30f18ae9..f5a08ca4c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lib/utils/os_utils.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lib/utils/os_utils.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -425,7 +425,7 @@ std::vector<void*> OS::allocate_locked_pages(size_t count)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ptr = ::mmap(nullptr, 2*page_size,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROT_READ | PROT_WRITE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MAP_ANONYMOUS | MAP_PRIVATE | MAP_NOCORE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MAP_ANON | MAP_PRIVATE | MAP_NOCORE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*fd=*/-1, /*offset=*/0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ptr == MAP_FAILED)
</span></pre><pre style='margin:0'>
</pre>