Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 Jun 2023 14:09:03 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: 8ae5ed687e47 - main - math/oleo: Fix build on llvm15
Message-ID:  <202306031409.353E93r8022540@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=8ae5ed687e477f6cd3c74cccabdb1c33a4bd40c9

commit 8ae5ed687e477f6cd3c74cccabdb1c33a4bd40c9
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-06-03 13:21:48 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-06-03 14:08:48 +0000

    math/oleo: Fix build on llvm15
    
    - Mark NOT_FOR_ARCHS on i386
    - Pet portclippy
    - Adopt port
---
 math/oleo/Makefile | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index 4bc979c65d2e..bcbc7abce937 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -4,17 +4,21 @@ PORTREVISION=	15
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	GNU spreadsheet for X11 and terminals
 WWW=		https://www.gnu.org/software/oleo/oleo.html
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+NOT_FOR_ARCHS=	i386
+NOT_FOR_ARCHS_REASON=	ld: error: duplicate symbol: yydebug
+
 LIB_DEPENDS=	libgsl.so:math/gsl
 
 USES=		bison:alias localbase ncurses perl5
 USE_PERL5=	build
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-xlt --without-sciplot
 # With -O2 configure hangs at "checking for working mktime..."
@@ -39,11 +43,16 @@ MOTIF_USES=		jpeg motif xorg
 MOTIF_USE=		XORG=ice,sm,x11,xext,xpm,xt
 MOTIF_CONFIGURE_WITH=	motif x
 MOTIF_LIBS=		-lXft -lfontconfig
-
 NLS_USES=		gettext
-NLS_LIBS=		-lintl
-NLS_CONFIGURE_ENABLE=	nls
 NLS_USES_OFF=		gettext-tools
+NLS_CONFIGURE_ENABLE=	nls
+NLS_LIBS=		-lintl
+
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+CPPFLAGS+=	-Wno-error=int-conversion
+.endif
 
 pre-configure:
 	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
@@ -57,4 +66,4 @@ pre-configure:
 		${WRKSRC}/doc/Makefile.in
 	${REINPLACE_CMD} -e "s|gslblas|gslcblas|" ${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



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