From nobody Sun Aug 6 12:30:50 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJf1k5h4qz4pyQt; Sun, 6 Aug 2023 12:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJf1k588Pz4PHp; Sun, 6 Aug 2023 12:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691325050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XbqHO8hu9P7aHc7hajFuf7bSCmOgwtL8eO8UJqDY+jc=; b=my1M/V7HboTk33zyJ/ZOxge+S09JqDhKT4RzOJBJALnnmj/kt5it3y/7uvjgRbuvWdHE3u As2Tm4HM6iharRttQfOVwcUCVRvnYMFRWmjKmQbGInBj0GurMmFcM7cLlqzx+UZc6aXHoc 7a526x+tPvJQ3gq93dK/uMtuMnbVPZVcAmfU6scmW+DHQWlDAwBezixWvNhjmEJRZBvm1X GU40vkcux9y6LLsYDmr5jRy6NcFRB1UAVLgrqgPZLGxof1YdbKbfmnssxkesWaatPaW9Vu aUHwuwT7vq9i1dIOfWl/uk7Tw83GmIDNVGyMsl3lQaOCD4IRGRHNovQhEnx++Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691325050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XbqHO8hu9P7aHc7hajFuf7bSCmOgwtL8eO8UJqDY+jc=; b=WH60i4fCK1QT9arjqvQDc1E5ItM25SidM+l8UeN7gi7kGekLcXqtU0t4mYRre/JYeOu9Si 3d0Aav8cQT/kx1et2qt/1dl25NJouiQMBqkbFkNktxjs9xBNw9WshfWDQ+g+DzSJS5wEUK 2FXl0oEgywNx9dXrp+ZeiN+PfDPAeCQZg1YOxkHem+i78i+/1rrB+5sRYBK+R73Mw8TKSQ gQFLj3ivdPBLDLZ2is1K5NrpvohHog3x8eIZKbTZBnIEeDaHatzWfyYhNLinq3thQnkycs v1sKocpVOGgqyLPZkCV2z6PiovJbYEdWUNaLz2AbMCSKXW7EG/voWuRTB7HcEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691325050; a=rsa-sha256; cv=none; b=xTTCM/m5IIvqWbdPbJNPpcCM8VZWNRLReIEHa31Uk+YmUdMOHJIBX4WVLsdCLJwjgN0Hbk qfn4wwgwkQKabRquhe7FVwvPejGCuQiN1ShpXmbGIFFiETfB43/m1pNYhxOXg/91H9jsJo s4csiYaMsX4EufGoKtffAuCrejnyzI2IZOPapdZeXzSgCKueJL5ie5j7VsDjGWqNbJR9kL FlYK+MI1Wvu/xK8qOCl4aERDSvOi44EcMCYE+zldgw80h3aDkYwsIDUv74B8fCtMvnusub x0G6eXMqkYr86/in89g1JzUmgnumlZRnzVYVRkzriR8LneQmkwgBJ6+L7RdHuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJf1k4FSYz19K5; Sun, 6 Aug 2023 12:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376CUo9P034975; Sun, 6 Aug 2023 12:30:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376CUoEi034974; Sun, 6 Aug 2023 12:30:50 GMT (envelope-from git) Date: Sun, 6 Aug 2023 12:30:50 GMT Message-Id: <202308061230.376CUoEi034974@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 005c37a45174 - main - math/scilab: Fix build with llvm16 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 005c37a45174ae911664b40437facf84951eaa2f Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=005c37a45174ae911664b40437facf84951eaa2f commit 005c37a45174ae911664b40437facf84951eaa2f Author: Muhammad Moinur Rahman AuthorDate: 2023-08-06 12:12:12 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-08-06 12:30:36 +0000 math/scilab: Fix build with llvm16 Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- math/scilab/Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/math/scilab/Makefile b/math/scilab/Makefile index f41c7c33ab4b..7f497638d3fe 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -27,6 +27,7 @@ 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 @@ -132,10 +133,14 @@ CONFIGURE_ARGS+= --enable-debug .include -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 150 CFLAGS+= -Wno-error=int-conversion .endif +.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 +CFLAGS+= -Wno-error=incompatible-function-pointer-types +.endif + .if ${GCC_DEFAULT} >= 10 # workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (rank-1 and scalar) FFLAGS+= -fallow-argument-mismatch @@ -144,6 +149,11 @@ FFLAGS+= -fallow-argument-mismatch post-patch: @${REINPLACE_CMD} 's,/usr/local,${LOCALBASE},' ${WRKSRC}/etc/librarypath.xml @${REINPLACE_CMD} -e 's, gfortran, ${FC},' ${WRKSRC}/modules/dynamic_link/src/scripts/configure +.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 + @${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 +.endif post-patch-GUI-on: # scilab segfaults on FreeBSD with C locale