<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d2af8e4441f752e84726fd9aa81fb90554ec5a76">https://github.com/macports/macports-ports/commit/d2af8e4441f752e84726fd9aa81fb90554ec5a76</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d2af8e4441f752e84726fd9aa81fb90554ec5a76
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Tue Jan 3 08:01:13 2023 +0700
<span style='display:block; white-space:pre;color:#404040;'> folly: non-functional portfile improvements: spaces, alphabetic sorting etc.
</span>---
devel/folly/Portfile | 53 ++++++++++++++++++++++++++++++----------------------
1 file changed, 31 insertions(+), 22 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 19b0f893eff..c8aa97376bc 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;'>@@ -37,7 +37,7 @@ long_description Folly (acronymed loosely after Facebook Open Source Library)
</span> It complements (as opposed to competing against) offerings such as Boost and of course \
std. In fact, we embark on defining our own component only when something we need is \
either not available, or does not meet the needed performance profile. We endeavor to \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- remove things from folly if or when std or Boost obsoletes them.\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ remove things from folly if or when std or Boost obsoletes them. \
</span> Performance concerns permeate much of Folly, sometimes leading to designs that are \
more idiosyncratic than they would otherwise be (see e.g. PackedSyncPtr.h, SmallLocks.h). \
Good performance at large scale is a unifying theme in all of Folly.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,18 +51,18 @@ cmake.module_path-append \
</span> ${prefix}/lib/${port_libfmt}/cmake
depends_lib-append port:bzip2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:double-conversion \
</span> port:gflags \
port:google-glog \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:double-conversion \
</span> port:libevent \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:snappy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsodium \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libunwind \
</span> port:lz4 \
port:lzma \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:snappy \
</span> port:xz \
port:zlib \
port:zstd \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsodium \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libunwind \
</span> port:${port_libfmt}
cmake.generator Ninja
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,13 +83,16 @@ if {${build_arch} in [list ppc ppc64]} {
</span> 0003-Fixes-for-macOS-PPC.patch
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DBUILD_SHARED_LIBS=ON -DFOLLY_USE_JEMALLOC=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DBUILD_SHARED_LIBS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DFOLLY_USE_JEMALLOC=0
</span>
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append -std=c++17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -std=c++17
</span>
# error: TARGET_OS_xxx not defined, evaluates to 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-append -Wno-undef-prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-undef-prefix
</span>
# error: typedef redefinition with different types ('uint8_t' (aka 'unsigned char') vs 'enum clockid_t')
compiler.blacklist-append {clang < 1100}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,24 +104,28 @@ compiler.blacklist-append macports-gcc-12
</span> platform darwin {
# https://github.com/facebook/folly/issues/864
if {${os.major} <= 16} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DCOMPILER_HAS_F_ALIGNED_NEW=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCOMPILER_HAS_F_ALIGNED_NEW=OFF
</span> # gcc does not recognize -fno-aligned-allocation
if {[string match *clang* ${configure.compiler}]} {
configure.cxxflags-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -fno-aligned-allocation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -fno-aligned-allocation
</span> }
}
# Support for TCP fast-open was only added to macOS 10.11+
if {${os.major} < 15} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -DFOLLY_ALLOW_TFO=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DFOLLY_ALLOW_TFO=0
</span> }
if {[string match *gcc* ${configure.compiler}]} {
# ThreadName.cpp: error: invalid conversion from 'std::array<char, 16>::size_type' {aka 'long unsigned int'} to 'size_t*' {aka 'long unsigned int*'}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -fpermissive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -fpermissive
</span> # ___atomic_fetch_sub_8, ___atomic_load_8, ___atomic_exchange_8, ___atomic_store_8, ___atomic_compare_exchange_8, ___atomic_fetch_add_8
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -latomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -latomic
</span> # https://github.com/macports/macports-ports/pull/15689#issuecomment-1212969969
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -L${prefix}/lib -lgflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/lib -lgflags
</span> }
# Fix for building in Rosetta, so that x86 SSE is not invoked:
if {${os.major} == 10 && ${build_arch} eq "ppc"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,17 +135,19 @@ platform darwin {
</span> }
variant jemalloc description {Use je_malloc} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:jemalloc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DFOLLY_HAVE_WEAK_SYMBOLS=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DFOLLY_USE_JEMALLOC=0 -DFOLLY_USE_JEMALLOC=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -ljemalloc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:jemalloc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DFOLLY_HAVE_WEAK_SYMBOLS=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DFOLLY_USE_JEMALLOC=0 -DFOLLY_USE_JEMALLOC=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -ljemalloc
</span> }
variant native description {Build with best native support for local CPU capabilities} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} ni [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This flag is unsupported for PPC:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -march=native
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} in [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -march= flag is unsupported for PPC:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -mtune=native
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -mtune=native
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -march=native
</span> }
}
</pre><pre style='margin:0'>
</pre>