<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/97ac04fdac91bcef4764ffb7a95ace8a43004ef1">https://github.com/macports/macports-ports/commit/97ac04fdac91bcef4764ffb7a95ace8a43004ef1</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 97ac04f folly: Update to 2017.03.20.00
</span>97ac04f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 97ac04fdac91bcef4764ffb7a95ace8a43004ef1
</span>Author: Ryan Schmidt <git@ryandesign.com>
AuthorDate: Sun May 28 20:09:45 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> folly: Update to 2017.03.20.00
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/54214
</span>---
devel/folly/Portfile | 13 ++------
devel/folly/files/patch-alloc.diff | 55 -------------------------------
devel/folly/files/patch-malloc.diff | 59 ----------------------------------
devel/folly/files/patch-reference.diff | 31 ------------------
4 files changed, 3 insertions(+), 155 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/folly/Portfile b/devel/folly/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2476714..cc0aded 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/folly/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/folly/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup cxx11 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup facebook folly 2016.08.22.00 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup facebook folly 2017.03.20.00 v
</span> categories devel
platforms darwin
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,19 +14,13 @@ maintainers sean openmaintainer
</span> description An open-source C++ library developed and used at Facebook.
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 eae22943df01420f1e524a8d288b4d43ff1d3542 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fad4cc85dc7d20c62672ec438b38e852e6e58119d519a1607c678e71edef47eb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5dc40b05e7c9852001546e9f5e9737e26b197494 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8e58e5841890bcd999971663754f4f1c064acf0acb2c2efaddbd4488d2497f95
</span>
use_autoreconf yes
worksrcdir ${worksrcdir}/folly
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# can remove after next version is released
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-alloc.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-malloc.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-reference.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # needed for ax_boost and friends
depends_build-append \
port:autoconf-archive \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/folly/files/patch-alloc.diff b/devel/folly/files/patch-alloc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 57677c1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/folly/files/patch-alloc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,55 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2a0c9d069374e5953625ae45aaa9ccbece7a7f5d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Christopher Dykes <cdykes@fb.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 22 Aug 2016 09:52:34 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] More fixup of the build on Mac for HHVM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Summary: `std::__throw_bad_alloc()` is defined in `<new>` on OSX, so bring back the `#ifdef` guards that were there previously.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed By: markw65
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Differential Revision: D3749714
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fbshipit-source-id: 0338a4cece928fce0b9d33d41c17cfa99a319abe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- folly/portability/BitsFunctexcept.cpp | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- folly/portability/BitsFunctexcept.h | 4 ++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 6 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/folly/portability/BitsFunctexcept.cpp b/folly/portability/BitsFunctexcept.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 55b9561..1a72b69 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/folly/portability/BitsFunctexcept.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/folly/portability/BitsFunctexcept.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,9 +33,11 @@ void __throw_out_of_range(const char* msg) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throw std::out_of_range(msg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef _MSC_VER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void __throw_bad_alloc() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throw std::bad_alloc();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOLLY_NAMESPACE_STD_END
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/folly/portability/BitsFunctexcept.h b/folly/portability/BitsFunctexcept.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 80b2cb2..098d1e7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/folly/portability/BitsFunctexcept.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/folly/portability/BitsFunctexcept.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,13 +21,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if FOLLY_HAVE_BITS_FUNCTEXCEPT_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <bits/functexcept.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <new> // Some platforms define __throw_bad_alloc() here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <folly/Portability.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOLLY_NAMESPACE_STD_BEGIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [[noreturn]] void __throw_length_error(const char* msg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [[noreturn]] void __throw_logic_error(const char* msg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [[noreturn]] void __throw_out_of_range(const char* msg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef _MSC_VER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [[noreturn]] void __throw_bad_alloc();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOLLY_NAMESPACE_STD_END
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/folly/files/patch-malloc.diff b/devel/folly/files/patch-malloc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 98fcf6a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/folly/files/patch-malloc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,59 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 89166c82417a52f99dd373f510dd5119574dbf33 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Giuseppe Ottaviano <ott@fb.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 23 Aug 2016 10:14:40 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Make Malloc.h self-contained again
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Summary: D3743475 adds to `Malloc.h` a dependency on another folly header, which breaks it when used in stand-alone mode. This diff moves the include to the right `#ifdef` section.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed By: Gownta
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Differential Revision: D3757819
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fbshipit-source-id: 71664ca6a3a47b6e4449a4ef603fedf052c5df3b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- folly/Malloc.h | 13 +++++++++----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 9 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/folly/Malloc.h b/folly/Malloc.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 64fd393..fec188f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/folly/Malloc.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/folly/Malloc.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,8 +20,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma once
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FOLLY_MALLOC_H_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <folly/portability/BitsFunctexcept.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Define various MALLOCX_* macros normally provided by jemalloc. We define
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * them so that we don't have to include jemalloc.h, in case the program is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,6 +40,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(_GLIBCXX_USE_FB) && !defined(_LIBSTDCXX_FBSTRING)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <folly/detail/Malloc.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <folly/portability/BitsFunctexcept.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -87,13 +86,19 @@ extern "C" int mallctlbymib(const size_t*, size_t, void*, size_t*, void*,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __attribute__((__weak__));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <bits/functexcept.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FOLLY_HAVE_MALLOC_H 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else // !defined(_LIBSTDCXX_FBSTRING)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <folly/detail/Malloc.h> /* nolint */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <folly/portability/BitsFunctexcept.h> /* nolint */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // for malloc_usable_size
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// NOTE: FreeBSD 9 doesn't have malloc.h. It's defitions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// NOTE: FreeBSD 9 doesn't have malloc.h. Its definitions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // are found in stdlib.h.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if FOLLY_HAVE_MALLOC_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <malloc.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/folly/files/patch-reference.diff b/devel/folly/files/patch-reference.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 81ba406..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/folly/files/patch-reference.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From b646787c313a85935a894d6fb50e60e30d9f3b33 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Christopher Dykes <cdykes@fb.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 22 Aug 2016 15:55:49 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fixup a reference to detail/FunctionalExcept.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Summary: I missed this reference when I moved it to the portability folder. It is already being compiled at its new location.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed By: yfeldblum
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Differential Revision: D3754227
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fbshipit-source-id: 357b0c26ddbcefdc7640f6a334150abba90ed711
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- folly/Makefile.am | 4 ----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/folly/Makefile.am b/folly/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5df00b8..a51285f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/folly/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/folly/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -497,10 +497,6 @@ if !HAVE_WEAK_SYMBOLS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libfollybase_la_SOURCES += detail/MallocImpl.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if !HAVE_BITS_FUNCTEXCEPT_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libfollybase_la_SOURCES += detail/FunctionalExcept.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if HAVE_BOOST_CONTEXT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nobase_follyinclude_HEADERS += \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fibers/AddTasks.h \
</span></pre><pre style='margin:0'>
</pre>