<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6ae64d21b11ca84d2fd72da57e7559ca4bed8061">https://github.com/macports/macports-ports/commit/6ae64d21b11ca84d2fd72da57e7559ca4bed8061</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 6ae64d21b11 gocryptfs: Fix build for arm64
</span>6ae64d21b11 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6ae64d21b11ca84d2fd72da57e7559ca4bed8061
</span>Author: Marcel Bochtler <git@bochtler.io>
AuthorDate: Sun Nov 21 13:05:04 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> gocryptfs: Fix build for arm64
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Introduce doc variant, which is enabled by default.
</span><span style='display:block; white-space:pre;color:#404040;'> * Use go-md2man instead of pandoc on arm64 as this arch is not yet
</span><span style='display:block; white-space:pre;color:#404040;'> supported by upstream yet [1].
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [1]: https://github.com/jgm/pandoc/issues/6960
</span>---
fuse/gocryptfs/Portfile | 27 ++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/fuse/gocryptfs/Portfile b/fuse/gocryptfs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 00caa9f1ceb..1f211235edb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/fuse/gocryptfs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/fuse/gocryptfs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,9 +123,6 @@ go.vendors gopkg.in/yaml.v3 \
</span> set builddate "build_date_not_set"
set ldflags "-X \"main.GitVersion=${version}\" -X \"main.GitVersionFuse=${gitversionfuse}\" -X \"main.BuildDate=${builddate}\""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pandoc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> build.args -ldflags="${ldflags}"
# According to [1] there is no benefit to build gocryptfs with openssl on M1 Macs.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,15 +134,31 @@ variant openssl description {Build with openssl support} {
</span> depends_lib-append path:lib/libcrypto.dylib:openssl
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant doc description {Build man pages} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:go-md2man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/Documentation "${prefix}/bin/go-md2man -in=MANPAGE.md -out=${name}.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/Documentation "${prefix}/bin/go-md2man -in=MANPAGE-XRAY.md -out=${name}-xray.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/Documentation "${prefix}/bin/go-md2man -in=MANPAGE-STATFS.md -out=statfs.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pandoc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/Documentation "sh MANPAGE-render.bash"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {![variant_isset openssl]} {
build.env CGO_ENABLED=0
build.args-append -tags without_openssl
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/Documentation "sh MANPAGE-render.bash"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> destroot {
xinstall -m 0755 ${worksrcpath}/${name} ${destroot}${prefix}/bin/
xinstall -m 0755 ${worksrcpath}/Documentation/gocryptfs.1 ${destroot}${prefix}/share/man/man1
</pre><pre style='margin:0'>
</pre>