diff options
| author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2023-07-26 02:44:22 +0200 |
|---|---|---|
| committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2023-07-26 02:48:20 +0200 |
| commit | 95274bf4f99c71fc056013d966aec239161dfd74 (patch) | |
| tree | bc1e95977678cb5b6b00b33e333b28161885e706 /math | |
| parent | graphics/blender: update to 3.6.1 LTS release (+) (diff) | |
*/*: Fix build with llvm16 on 13.2-STABLE
As like as HEAD(14.0-RELEASE) llvm16 was merged in base for 13.2-STABLE
with the OSVERSION 1302507.
- Utilize USE_CXXSTD=c++14 or similar solution where applicable
- Update conditionals to addtionally check for OSVERSION greater than
1302507 and less than 1400000
Approved by: portmgr (blanket)
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'math')
| -rw-r--r-- | math/alps/Makefile | 9 | ||||
| -rw-r--r-- | math/eval/Makefile | 2 | ||||
| -rw-r--r-- | math/form/Makefile | 2 | ||||
| -rw-r--r-- | math/lemon/Makefile | 7 |
4 files changed, 4 insertions, 16 deletions
diff --git a/math/alps/Makefile b/math/alps/Makefile index 9180c3dffb4d..24c6e415b514 100644 --- a/math/alps/Makefile +++ b/math/alps/Makefile @@ -15,6 +15,7 @@ LIB_DEPENDS= libCoinUtils.so:math/coinutils \ libopenblas.so:math/openblas USES= blaslapack gmake libtool pkgconfig +USE_CXXSTD= c++14 USE_LDCONFIG= yes USE_GITHUB= yes @@ -25,14 +26,6 @@ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -.include <bsd.port.options.mk> - -post-patch: -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 - @${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \ - ${WRKSRC}/Alps/src/AlpsHelperFunctions.h -.endif - post-install: ${RM} -r ${STAGEDIR}${PREFIX}/share diff --git a/math/eval/Makefile b/math/eval/Makefile index 1093e38904ea..dc0c0b536928 100644 --- a/math/eval/Makefile +++ b/math/eval/Makefile @@ -19,7 +19,7 @@ PLIST_FILES= bin/Eval .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/math/form/Makefile b/math/form/Makefile index 4957163b59a3..bb946fdc542a 100644 --- a/math/form/Makefile +++ b/math/form/Makefile @@ -37,7 +37,7 @@ OPENMPI_CONFIGURE_ENV+= MPICC="${MPICC}" \ .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/math/lemon/Makefile b/math/lemon/Makefile index a695e8fc07c1..79b26d1b75ea 100644 --- a/math/lemon/Makefile +++ b/math/lemon/Makefile @@ -19,6 +19,7 @@ LIB_DEPENDS= libCbc.so:math/cbc \ libOsi.so:math/osi USES= cmake +USE_CXXSTD= c++14 USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS @@ -32,12 +33,6 @@ GLPK_DESC= Build with GLPK solver GLPK_CMAKE_BOOL= LEMON_ENABLE_GLPK GLPK_LIB_DEPENDS= libglpk.so:math/glpk -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 -CXXFLAGS+= -Dregister= -.endif - post-install: @${RM} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-0.x-to-1.x.sh |