Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Apr 2023 09:30:33 GMT
From:      Robert Clausecker <fuz@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: ae458dac6c58 - main - japanese/sj3-server: work around duplicate symbol issue
Message-ID:  <202304170930.33H9UXIC051574@gitrepo.freebsd.org>

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

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

commit ae458dac6c58fdc36ec47fe4bf65690b4175c55b
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-04-16 13:51:08 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-04-17 09:27:26 +0000

    japanese/sj3-server: work around duplicate symbol issue
    
    Add -fcommon to CFLAGS to enable a build on recent clang/gcc.
    This fixes the build on FreeBSD 13+.
    
    Approved by:    portmgr (build fix blanket)
---
 japanese/sj3-server/Makefile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile
index 5a01bbbea02e..2f92b86f1ab8 100644
--- a/japanese/sj3-server/Makefile
+++ b/japanese/sj3-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sj3
 PORTVERSION=	2.0.1.20
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	japanese
 MASTER_SITES=	LOCAL/nork
 PKGNAMESUFFIX=	-server
@@ -15,9 +15,6 @@ COMMENT=	Japanese input method, binary part
 LICENSE=	MIT
 LICENSE_FILE=	${FILESDIR}/COPYING
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: hs_point
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: hs_point
-
 LIB_DEPENDS=	libsj3lib.so:japanese/sj3-lib
 
 USES=		imake
@@ -25,7 +22,7 @@ USE_RC_SUBR=	sj3
 PLIST_SUB=	USERS=${USERS} GROUPS=${GROUPS}
 SUB_FILES=	sj3_freebsd.tmpl
 SUB_LIST=	DESTDIR=${DESTDIR}
-CFLAGS+=	-Wno-return-type
+CFLAGS+=	-Wno-return-type -fcommon
 USERS=		_sj3
 GROUPS=		_sj3
 PORTDOCS=	Nihongo.ps.Z hinsi.ms makedict.ms sj3lib.ms sj3serv.ms



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