<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/23d9f01d51951b8dc71fbe459c67a600a0b4938a">https://github.com/macports/macports-ports/commit/23d9f01d51951b8dc71fbe459c67a600a0b4938a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 23d9f01d51951b8dc71fbe459c67a600a0b4938a
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Mon May 6 11:45:01 2024 +0800

<span style='display:block; white-space:pre;color:#404040;'>    R-duckdb: fix build on 10.7–10.11
</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/69902
</span>---
 R/R-duckdb/Portfile                   | 30 ++++++++++++++++++++++++++----
 R/R-duckdb/files/patch-Makevars.diff  | 11 +++++++++++
 R/R-duckdb/files/patch-libatomic.diff |  7 -------
 3 files changed, 37 insertions(+), 11 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-duckdb/Portfile b/R/R-duckdb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index af83365be27..4f068c80464 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-duckdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-duckdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,10 @@
</span> 
 PortSystem          1.0
 PortGroup           R 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# _SC_PHYS_PAGES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 15
</span> 
 R.setup             cran duckdb duckdb 0.10.2
 revision            0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,10 +26,28 @@ compiler.cxx_standard 2017
</span> # https://github.com/duckdb/duckdb-r/issues/152
 patchfiles-append   patch-fix-cmath.diff
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/duckdb/duckdb/issues/7009
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match macports-gcc* ${configure.compiler}] && (${configure.build_arch} in [list i386 ppc])} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-libatomic.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append   patch-Makevars.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # https://github.com/duckdb/duckdb/issues/7009
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[string match macports-gcc* ${configure.compiler}] && (${configure.build_arch} in [list i386 ppc])} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@ATOMIC@|-latomic|" ${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|@ATOMIC@||" ${worksrcpath}/src/Makevars
</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;'>+        # https://trac.macports.org/ticket/69902
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # On 10.6 and earlier LegacySupport is already used,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # no need in duplicate flags.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {${os.major} > 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@LEGACY_INC@|-isystem${prefix}/include/LegacySupport|" ${worksrcpath}/src/Makevars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@LEGACY_LFLAG@|-L${prefix}/lib -lMacportsLegacySupport|" ${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|@LEGACY_INC@||" ${worksrcpath}/src/Makevars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@LEGACY_LFLAG@||" ${worksrcpath}/src/Makevars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
 variant tests description "Enable testing" {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-duckdb/files/patch-Makevars.diff b/R/R-duckdb/files/patch-Makevars.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..03e112f3f09
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-duckdb/files/patch-Makevars.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makevars   2024-04-30 10:20:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makevars   2024-05-06 11:17:24.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,5 +15,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include Makevars.duckdb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX_STD = CXX17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PKG_CPPFLAGS = -Iinclude -I../inst/include -DDUCKDB_DISABLE_PRINT -DDUCKDB_R_BUILD -Iduckdb/src/include -Iduckdb/third_party/concurrentqueue -Iduckdb/third_party/fast_float -Iduckdb/third_party/fastpforlib -Iduckdb/third_party/fmt/include -Iduckdb/third_party/fsst -Iduckdb/third_party/httplib -Iduckdb/third_party/hyperloglog -Iduckdb/third_party/jaro_winkler -Iduckdb/third_party/jaro_winkler/details -Iduckdb/third_party/libpg_query -Iduckdb/third_party/libpg_query/include -Iduckdb/third [...]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OBJECTS=rfuns.o database.o connection.o statement.o register.o relational.o scan.o transform.o utils.o reltoaltrep.o types.o cpp11.o $(SOURCES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_CPPFLAGS = -Iinclude -I../inst/include -DDUCKDB_DISABLE_PRINT -DDUCKDB_R_BUILD -Iduckdb/src/include -Iduckdb/third_party/concurrentqueue -Iduckdb/third_party/fast_float -Iduckdb/third_party/fastpforlib -Iduckdb/third_party/fmt/include -Iduckdb/third_party/fsst -Iduckdb/third_party/httplib -Iduckdb/third_party/hyperloglog -Iduckdb/third_party/jaro_winkler -Iduckdb/third_party/jaro_winkler/details -Iduckdb/third_party/libpg_query -Iduckdb/third_party/libpg_query/include -Iduckdb/third [...]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OBJECTS = rfuns.o database.o connection.o statement.o register.o relational.o scan.o transform.o utils.o reltoaltrep.o types.o cpp11.o $(SOURCES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_LIBS = @LEGACY_LFLAG@ @ATOMIC@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-duckdb/files/patch-libatomic.diff b/R/R-duckdb/files/patch-libatomic.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dd464191aa0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-duckdb/files/patch-libatomic.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makevars   2024-04-30 10:20:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makevars   2024-05-03 20:42:41.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,3 +17,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX_STD = CXX17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_CPPFLAGS = -Iinclude -I../inst/include -DDUCKDB_DISABLE_PRINT -DDUCKDB_R_BUILD -Iduckdb/src/include -Iduckdb/third_party/concurrentqueue -Iduckdb/third_party/fast_float -Iduckdb/third_party/fastpforlib -Iduckdb/third_party/fmt/include -Iduckdb/third_party/fsst -Iduckdb/third_party/httplib -Iduckdb/third_party/hyperloglog -Iduckdb/third_party/jaro_winkler -Iduckdb/third_party/jaro_winkler/details -Iduckdb/third_party/libpg_query -Iduckdb/third_party/libpg_query/include -Iduckdb/third [...]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJECTS=rfuns.o database.o connection.o statement.o register.o relational.o scan.o transform.o utils.o reltoaltrep.o types.o cpp11.o $(SOURCES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PKG_LIBS = -latomic
</span></pre><pre style='margin:0'>

</pre>