<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/04cd3597655dd7a89c1ba5bf6066f091bd2c31c4">https://github.com/macports/macports-ports/commit/04cd3597655dd7a89c1ba5bf6066f091bd2c31c4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 04cd3597655dd7a89c1ba5bf6066f091bd2c31c4
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Fri Mar 15 13:01:50 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-highs: use bundled HiGHS lib, revbump
</span>---
R/R-highs/Portfile | 26 +++++++++++++++++++-------
R/R-highs/files/patch-cxx11.diff | 6 ------
R/R-highs/files/patch-fix-paths.diff | 6 ++++++
R/R-highs/files/patch-gcc-builds.diff | 31 +++++++++++++++++++++++++++++++
4 files changed, 56 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-highs/Portfile b/R/R-highs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 08579022179..b9f76cc14f2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-highs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-highs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</span> PortGroup R 1.0
R.setup cran roigrp highs 0.1-10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories-append math
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,15 +21,26 @@ depends_build-append \
</span> path:bin/cmake:cmake \
port:bash \
port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:HiGHS \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:R-checkmate \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:R-checkmate \
</span> port:R-Rcpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-use-Macports-highs.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Switching to bundled HiGHS due to incompatibility with v. 1.7.0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# until upstream addresses it: https://gitlab.com/roigrp/solver/highs/-/issues/5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# depends_lib-append port:HiGHS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patchfiles patch-use-Macports-highs.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# reinplace "s,@PREFIX@,${prefix}," ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts_build HiGHS
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,@PREFIX@,${prefix}," ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # To avoid multiplying patches, just apply this for gcc cases:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-gcc-builds.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Clang gets upset about non-existing path here, drop it:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-paths.diff
</span> }
# There are no specific tests atm.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-highs/files/patch-cxx11.diff b/R/R-highs/files/patch-cxx11.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 021b4907c64..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-highs/files/patch-cxx11.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makevars.in.orig 2023-05-14 01:31:56.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makevars.in 2023-05-18 06:11:03.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,2 +1,2 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_LIBS= -L@RHIGHS_LIB_DIR@/lib -L@RHIGHS_LIB_DIR@/lib64 -lhighs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PKG_CPPFLAGS=-I@RHIGHS_LIB_DIR@/include -I@RHIGHS_LIB_DIR@/include/highs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PKG_CPPFLAGS= -D_GLIBCXX_USE_CXX11_ABI=0 -I@RHIGHS_LIB_DIR@/include -I@RHIGHS_LIB_DIR@/include/highs
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-highs/files/patch-fix-paths.diff b/R/R-highs/files/patch-fix-paths.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f980aab8290
</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-highs/files/patch-fix-paths.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makevars.in 2023-05-14 01:31:56.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makevars.in 2024-03-28 03:25:47.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,2 +1,2 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PKG_LIBS= -L@RHIGHS_LIB_DIR@/lib -L@RHIGHS_LIB_DIR@/lib64 -lhighs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_LIBS= -L@RHIGHS_LIB_DIR@/lib -lhighs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CPPFLAGS=-I@RHIGHS_LIB_DIR@/include -I@RHIGHS_LIB_DIR@/include/highs
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-highs/files/patch-gcc-builds.diff b/R/R-highs/files/patch-gcc-builds.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d132df3ad94
</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-highs/files/patch-gcc-builds.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makevars.in 2023-05-14 01:31:56.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makevars.in 2024-03-28 03:36:26.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,2 +1,2 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PKG_LIBS= -L@RHIGHS_LIB_DIR@/lib -L@RHIGHS_LIB_DIR@/lib64 -lhighs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PKG_CPPFLAGS=-I@RHIGHS_LIB_DIR@/include -I@RHIGHS_LIB_DIR@/include/highs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_LIBS= -L@RHIGHS_LIB_DIR@/lib -lhighs -latomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_CPPFLAGS= -D_GLIBCXX_USE_CXX11_ABI=0 -I@RHIGHS_LIB_DIR@/include -I@RHIGHS_LIB_DIR@/include/highs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- inst/HiGHS/CMakeLists.txt 2023-05-14 01:32:16.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ inst/HiGHS/CMakeLists.txt 2024-03-28 04:16:09.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -135,8 +135,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86\_64|i686)")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mpopcnt")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(ppc64|powerpc64)")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mpopcntd")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message("FLAG_MPOPCNT_SUPPORTED is not available on this architecture")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -184,6 +182,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(CMAKE_CSharp_COMPILER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0 -Wl,-latomic")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set (CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -latomic")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_cxx_compiler_flag("-fno-omit-frame-pointer" NO_OMIT_FRAME_POINTER_FLAG_SUPPORTED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NO_OMIT_FRAME_POINTER_FLAG_SUPPORTED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_DEBUG} ${CMAKE_C_FLAGS_RELEASE} -fno-omit-frame-pointer")
</span></pre><pre style='margin:0'>
</pre>