<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c3497fe523f1b185d51b2013a12883aafdec7e0e">https://github.com/macports/macports-ports/commit/c3497fe523f1b185d51b2013a12883aafdec7e0e</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 c3497fe523f nss: check if TARGET_OS_IPHONE is defined
</span>c3497fe523f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c3497fe523f1b185d51b2013a12883aafdec7e0e
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Jan 17 13:25:24 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> nss: check if TARGET_OS_IPHONE is defined
</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/69116
</span>---
net/nss/Portfile | 4 +++-
net/nss/files/undef-prefix.patch | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/nss/Portfile b/net/nss/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c261be615f2..80470e2596e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/nss/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/nss/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ long_description {*}${description}
</span> use_configure no
homepage https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_release NSS_[strsed ${version} {g/\./_/}]_RTM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_release NSS_[string map {. _} ${version}]_RTM
</span>
master_sites https://ftp.mozilla.org/pub/security/nss/releases/${my_release}/src/ \
ftp://ftp.mozilla.org/pub/security/nss/releases/${my_release}/src/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,6 +39,8 @@ if {${configure.build_arch} in [list i386 x86_64]} {
</span> compiler.blacklist-append *gcc-4.* *gcc-3.*
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles undef-prefix.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # VSX and Crypto have to be disabled, since they belong to post-G5 ISA.
# See: https://bugzilla.mozilla.org/show_bug.cgi?id=1687164
# gcc-4.2 does not recognize these flags:
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/nss/files/undef-prefix.patch b/net/nss/files/undef-prefix.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3eefedbef75
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/nss/files/undef-prefix.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Using TARGET_OS_* macros without checking if they are defined is an
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error in clang 11.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- nss/gtests/google_test/gtest/include/gtest/internal/gtest-port-arch.h.orig 2023-12-19 04:23:08
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ nss/gtests/google_test/gtest/include/gtest/internal/gtest-port-arch.h 2024-01-17 13:13:52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,7 +69,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define GTEST_OS_MAC 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <TargetConditionals.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if TARGET_OS_IPHONE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define GTEST_OS_IOS 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined __DragonFly__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- nss/lib/freebl/unix_rand.c.orig 2023-12-19 04:23:08
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ nss/lib/freebl/unix_rand.c 2024-01-17 13:17:16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -594,7 +594,7 @@ RNG_GetNoise(void *buf, size_t maxbytes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef DARWIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <TargetConditionals.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !TARGET_OS_IPHONE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <crt_externs.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -607,7 +607,7 @@ RNG_SystemInfoForRNG(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *const *cp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *randfile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef DARWIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if TARGET_OS_IPHONE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* iOS does not expose a way to access environ. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char **environ = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span></pre><pre style='margin:0'>
</pre>