<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/4b09c9e6f1ee9237c224f3adc6a617beebfac9d5">https://github.com/macports/macports-ports/commit/4b09c9e6f1ee9237c224f3adc6a617beebfac9d5</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 4b09c9e6f1e cryptlib: fix build with gcc
</span>4b09c9e6f1e is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 4b09c9e6f1ee9237c224f3adc6a617beebfac9d5
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sat Sep 7 22:35:20 2024 +0800

<span style='display:block; white-space:pre;color:#404040;'>    cryptlib: fix build with gcc
</span>---
 devel/cryptlib/Portfile                       |  6 ++++++
 devel/cryptlib/files/patch-static_assert.diff | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cryptlib/Portfile b/devel/cryptlib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8d7c2d9f463..ea45625571f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cryptlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cryptlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,6 +51,9 @@ patchfiles-append   compiler.patch
</span> patchfiles-append   implicit.patch
 patchfiles-append   patch-makefile.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# cert/certrev.c: error: implicit declaration of function 'static_assert'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-static_assert.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Build fails when compiler is gcc or llvm-gcc; warnings are printed when compiler is clang.
 conflicts_build     unixODBC
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,6 +61,9 @@ use_configure       no
</span> 
 configure.ldflags-append -lz
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# crypt/chacha20.c:21: error: redefinition of typedef ‘chacha_ctx’
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.target        default shared
 build.args          CC="${configure.cc}" \
                     PREFIX="${prefix}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cryptlib/files/patch-static_assert.diff b/devel/cryptlib/files/patch-static_assert.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1341859aa6d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cryptlib/files/patch-static_assert.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- misc/debug.h.orig      2023-07-02 02:02:58.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ misc/debug.h   2024-09-07 22:31:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,8 +99,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   #define static_assert_opt( expr, string ) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             assert( expr )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined( __GNUC__ ) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    ( ( __GNUC__ == 4 && __GNUC_MINOR__ >= 7 && defined( static_assert ) ) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          ( __GNUC__ >= 5 ) ) 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    ( ( __GNUC__ == 4 && __GNUC_MINOR__ >= 7) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          ( __GNUC__ >= 5 ) ) && defined( static_assert )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   /* Supposedly built into gcc 4.5 and above (as usual for new gcc features
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    this isn't really documented, but web comments indicate that it should 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    be present in 4.5 and above), however trying this with 4.5 produces
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,7 +123,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    leave it for now */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   #define static_assert_opt( expr, string ) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             assert( expr )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined( __clang__ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined( __clang__ ) || ( defined( __GNUC__ ) && !defined( static_assert ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   /* Supported in LLVM/clang, however it's present using the C11 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      _Static_assert name rather than the C++11 static_assert one.  Some 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    assert.h's will map static_assert to _Static_assert, but since this 
</span></pre><pre style='margin:0'>

</pre>