<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/2df92cc6f1c3bb6519ff08de39b6b34985141022">https://github.com/macports/macports-ports/commit/2df92cc6f1c3bb6519ff08de39b6b34985141022</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2df92cc6f1c3bb6519ff08de39b6b34985141022
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Tue Jan 3 07:51:24 2023 +0700
<span style='display:block; white-space:pre;color:#404040;'> folly: PPC-related improvements
</span>---
devel/folly/Portfile | 37 ++++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 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 75ff6d74a59..19b0f893eff 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;'>@@ -18,11 +18,11 @@ if {[string match *clang* ${configure.compiler}]} {
</span> # NB: Facebook does not do API stabiilty, apparently, so please don't
# upgrade without also upgrading its dependents, as listed by:
# port list rdepends:folly
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup facebook folly 2022.08.08.00 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup facebook folly 2023.01.02.00 v
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 aaaf802ce3318fb2a666201779d8d254a53e6dec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a8915c7191f36d5529a49b89c3fe6847db840e5e28a9456149352c0238a5776d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3684846
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6c22c55fdd417ebee9ec3c2b32397b3d99017ff2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1c1ae46f5b1af7ec88db31094dacfd1380d6b1aa0f6bd71ed78298ffcbaaa030 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3759073
</span>
categories devel
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,14 +67,20 @@ depends_lib-append port:bzip2 \
</span>
cmake.generator Ninja
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-cmakelists.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0001-folly-deps.cmake-do-not-require-c-abi-with-GCC-on-Ap.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if {${os.platform} eq "darwin" && ${os.major} < 16} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-older-systems.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-Fixes-for-older-macOS.patch
</span> }
if {${build_arch} in [list ppc ppc64]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-darwin-ppc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-Fixes-for-macOS-PPC.patch
</span> }
configure.args-append -DBUILD_SHARED_LIBS=ON -DFOLLY_USE_JEMALLOC=0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,10 +108,6 @@ platform darwin {
</span> -fno-aligned-allocation
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://kumasento.github.io/2020-06-12-glog-gflags-and-c-abi/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -D_GLIBCXX_USE_CXX11_ABI=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> # Support for TCP fast-open was only added to macOS 10.11+
if {${os.major} < 15} {
configure.cxxflags-append -DFOLLY_ALLOW_TFO=0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,6 +120,11 @@ platform darwin {
</span> # https://github.com/macports/macports-ports/pull/15689#issuecomment-1212969969
configure.ldflags-append -L${prefix}/lib -lgflags
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix for building in Rosetta, so that x86 SSE is not invoked:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} == 10 && ${build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCMAKE_LIBRARY_ARCHITECTURE="ppc" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DIS_X86_64_ARCH=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant jemalloc description {Use je_malloc} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,11 +138,7 @@ variant native description {Build with best native support for local CPU capabil
</span> if {${build_arch} ni [list ppc ppc64]} {
# This flag is unsupported for PPC:
configure.cxxflags-append -march=native
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -mtune=G4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -mtune=G5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append -mtune=native
</span> }
}
</pre><pre style='margin:0'>
</pre>