Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Aug 2023 13:12:31 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 79be3a828152 - main - math/scilab: Unbreak build on 12 and 13
Message-ID:  <202308131312.37DDCVsC001930@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=79be3a828152cd1be5f6ddacbaf17eff38bb79b5

commit 79be3a828152cd1be5f6ddacbaf17eff38bb79b5
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-08-13 13:00:15 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-08-13 13:12:15 +0000

    math/scilab: Unbreak build on 12 and 13
    
    Although my previous commit fixed build with llvm16 it broke the build
    on 12 and 13.
    
    Reported by:    makc
    Approved by:    portmgr (blanket)
    Sponsored by:   The FreeBSD Foundation
---
 math/scilab/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 7f497638d3fe..0f27225bea5c 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -27,7 +27,6 @@ RUN_DEPENDS=	xdg-open:devel/xdg-utils
 USES=		compiler:c++17-lang cpe desktop-file-utils eigen:3,build \
 		fortran gettext gmake gnome iconv:wchar_t libtool \
 		localbase ncurses pathfix pkgconfig shared-mime-info
-USE_CXXSTD=	c++14
 USE_LOCALE=	en_US.UTF-8
 
 GNU_CONFIGURE=	yes
@@ -153,6 +152,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|std::filesystem|std::__fs::filesystem|g' \
 		${WRKSRC}/modules/fileio/src/cpp/fullpath.cpp \
 		${WRKSRC}/modules/fileio/sci_gateway/cpp/sci_get_absolute_file_path.cpp
+	@${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|' \
+		${WRKSRC}/modules/ast/includes/types/sparseOp.hxx
+	@${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \
+		${WRKSRC}/modules/ast/src/cpp/types/sparse.cpp
 .endif
 
 post-patch-GUI-on:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308131312.37DDCVsC001930>