Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 24 Jun 2023 18:10:13 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: a41dccaf8c7d - main - japanese/mecab: Fix build with llvm16
Message-ID:  <202306241810.35OIADxj016466@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by bofh:

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

commit a41dccaf8c7df175866e7d8ce9a1dedb2a890f40
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-06-24 17:29:06 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-06-24 18:10:02 +0000

    japanese/mecab: Fix build with llvm16
    
    - Utilize USES=localbase
    - Pet portclippy
    
    Sponsored by:   The FreeBSD Foundation
---
 japanese/mecab/Makefile | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index f075f3abc728..a86e474e22b1 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -14,20 +14,25 @@ LICENSE_COMB=	multi
 BROKEN_mips=		fails to link: Nonrepresentable section on output
 BROKEN_mips64=		fails to link: Nonrepresentable section on output
 
+USES=		gettext-tools iconv libtool localbase perl5
+USE_LDCONFIG=	yes
+USE_PERL5=	build
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	ac_cv_lib_stdcpp_main=no
-INSTALL_TARGET=	install-strip
-USES=		gettext-tools iconv libtool perl5
-USE_PERL5=	build
-USE_LDCONFIG=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 PORTDOCS=	AUTHORS README *.html
 
 OPTIONS_DEFINE=	DOCS
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+CPPFLAGS+=  -Dregister=
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} '/^libmecab_la_LIBADD =/s/$$/ $$(LTLIBICONV)/' \
 		${WRKSRC}/src/Makefile.in
@@ -35,6 +40,10 @@ post-patch:
 		-e '/CFLAGS/s|-O3|${CFLAGS}|' \
 		-e '/CXXFLAGS/s|-O3|${CXXFLAGS}|' \
 		${WRKSRC}/configure
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+	@${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|' \
+		${WRKSRC}/src/dictionary.cpp
+.endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}


home | help

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