<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/21a0ce995e9777f5cfd4e83e37ea2172331b41df">https://github.com/macports/macports-ports/commit/21a0ce995e9777f5cfd4e83e37ea2172331b41df</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 21a0ce995e9777f5cfd4e83e37ea2172331b41df
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Tue Apr 30 09:42:02 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-fs, R-httpuv: fix build on 10.7 with clang-16
</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/69853
</span>---
R/R-fs/Portfile | 17 +++++++++++------
R/R-fs/files/0003-libuv-link-to-legacysupport.patch | 4 ++--
R/R-httpuv/Portfile | 7 ++++++-
R/R-httpuv/files/0003-Link-to-LegacySupport.patch | 2 +-
4 files changed, 20 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-fs/Portfile b/R/R-fs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e57ee30c4c..1337c26835e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-fs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-fs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,8 +9,8 @@ PortGroup R 1.0
</span> legacysupport.newest_darwin_requires_legacy 14
# Revert to GitHub once updated there.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup cran r-lib fs 1.6.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran r-lib fs 1.6.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> # libuv version used:
set uv_ver 1.44.2
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,9 @@ long_description fs provides a cross-platform, uniform interface to file syst
</span> which brings the benefit of extensive real-world use and rigorous cross-platform testing. \
The name, and some of the interface, is partially inspired by Rust’s fs module.
homepage https://fs.r-lib.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a46e5f1167de09a2f987911b7e514f43bc7b4ff1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fa82061e50d7a4d94b7e404f9f2b699e75ae8fbfb575fabdfc2c39f536c0f971 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1185603
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c7699268f4880310863af76a1eb990752caa109d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7e06290f2dbe36f54fdf51b748a4b00b8b0f68967b5754e37e0c83df7fea5ac8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1201506
</span>
patch.pre_args -p1
patchfiles 0001-fs-fix-libuv-for-10.7.patch \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,12 @@ if {${os.platform} eq "darwin" && ${os.major} < 15} {
</span> patchfiles-append \
0003-libuv-link-to-legacysupport.patch
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/Makevars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/69853
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@MP_FLAGS@|-I${prefix}/include/LegacySupport -Wno-error=incompatible-function-pointer-types|" ${worksrcpath}/src/Makevars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@MP_FLAGS@|-I${prefix}/include/LegacySupport|" ${worksrcpath}/src/Makevars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-fs/files/0003-libuv-link-to-legacysupport.patch b/R/R-fs/files/0003-libuv-link-to-legacysupport.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 29daa83f405..475422b2842 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-fs/files/0003-libuv-link-to-legacysupport.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-fs/files/0003-libuv-link-to-legacysupport.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,8 +15,8 @@ index dd892c7d..6eb0a5cc 100644
</span>
$(LIBUV)/Makefile:
(cd $(LIBUV) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- && CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS) $(CPICFLAGS) $(C_VISIBILITY) -std=c99" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS)" ./configure --quiet)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS) -I@PREFIX@/include/LegacySupport $(CPICFLAGS) $(C_VISIBILITY) -std=c99" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS) -lMacportsLegacySupport" ./configure --quiet)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- && CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS) $(CPICFLAGS) $(C_VISIBILITY) -std=c99" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS)" ./configure $(R_CONFIGURE_FLAGS) --quiet)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS) @MP_FLAGS@ $(CPICFLAGS) $(C_VISIBILITY) -std=c99" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS) -lMacportsLegacySupport" ./configure $(R_CONFIGURE_FLAGS) --quiet)
</span>
$(LIBUV)/.libs/libuv.a: $(LIBUV)/Makefile
$(MAKE) --directory=$(LIBUV) \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-httpuv/Portfile b/R/R-httpuv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0f29fbc6d9d..5f54760229e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-httpuv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-httpuv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,12 @@ if {${os.platform} eq "darwin" && ${os.major} < 15} {
</span> patchfiles-append \
0003-Link-to-LegacySupport.patch
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/Makevars.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/69853
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@MP_FLAGS@|-I${prefix}/include/LegacySupport -Wno-error=incompatible-function-pointer-types|" ${worksrcpath}/src/Makevars.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@MP_FLAGS@|-I${prefix}/include/LegacySupport|" ${worksrcpath}/src/Makevars.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-httpuv/files/0003-Link-to-LegacySupport.patch b/R/R-httpuv/files/0003-Link-to-LegacySupport.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 0940dd314cb..fba8f7f12cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-httpuv/files/0003-Link-to-LegacySupport.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-httpuv/files/0003-Link-to-LegacySupport.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@ index 3c95cb1..01e7269 100644
</span> fi; \
chmod +x configure; \
- CC="$(CC)" CFLAGS="$(CFLAGS) $(CPICFLAGS) $(C_VISIBILITY) -DNDEBUG" CPPFLAGS="$(CPPFLAGS)" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS)" ./configure $(CONFIGURE_FLAGS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CC="$(CC)" CFLAGS="$(CFLAGS) -I@PREFIX@/include/LegacySupport $(CPICFLAGS) $(C_VISIBILITY) -DNDEBUG" CPPFLAGS="$(CPPFLAGS)" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS) -lMacportsLegacySupport" ./configure $(CONFIGURE_FLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CC="$(CC)" CFLAGS="$(CFLAGS) @MP_FLAGS@ $(CPICFLAGS) $(C_VISIBILITY) -DNDEBUG" CPPFLAGS="$(CPPFLAGS)" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS) -lMacportsLegacySupport" ./configure $(CONFIGURE_FLAGS)
</span>
libuv/.libs/libuv.a: libuv/Makefile
$(MAKE) --directory=libuv \
</pre><pre style='margin:0'>
</pre>