From nobody Mon Apr 17 09:30:33 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 4Q0MGx6S5sz45dhX; Mon, 17 Apr 2023 09:30:33 +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 4Q0MGx2ChLz43CZ; Mon, 17 Apr 2023 09:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681723833; 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=TM3nxp2egAPShMswKyvmXwYvCeiKhBV+sYQV1Xs3ewo=; b=LWtt+q0IlvU/CPZWJ2nIGlnSMnejcrUt9el4jhJa1MkKzNme35U44BaZE3Gp/ypDDtJS3H bYMelU4h+Au4oVvuxmNiD37TtYG/E6QbM1RUIen5UVK6knF9JpYCx2dt2YNBU5pCI7bg6a Rqcn87mHcAhWIpPh7S94qGeXlx5WSbUX5DLjFGkibG9FSuEnVLNMvi9AnkTARnvj2gEgxD rGae9akzaTeDbcaISjC39tfs5+h61axouenEuRp+TLKK5tDk6jb96z/Y9x25hAl4CaVLBS F0jTGyZ0FmYMruxAaELK9wUBbPlvaGjE9Al613rpfAZ8aOVnH0CmwkLIztk7Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681723833; 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=TM3nxp2egAPShMswKyvmXwYvCeiKhBV+sYQV1Xs3ewo=; b=tsq4PHv/uWgi0pcx74F/TK5TcT74TrHc4E6VG2mBTXhNQQjafkgp7EQNyCaxY8Q3Q8U/Oq m4tY7sfztcRbG60styvyrvtEcegJM15B6T3VggoOJjTc8gNsWD5nZ8lzQTdBYufS6XZUIT HcvBJ8STnjSZZwmY6cldOgZ242V2mjCmOOh0yu25YzHoZferoGI6UEuAeQHXf8z77tH942 zWyjWmwP/jBX/BuHnlx1PoiAiQxW1tsXvBDcMqjY6XKGfZQYvMFbDJaF3rdFbKQAOZWon8 j9J7f3D2BQlKrsYADJH0Y608eVnwzC8s5k73TWKQqM2LWX8vyXPu4cwJAIKlRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681723833; a=rsa-sha256; cv=none; b=G5ywI+k0nl+oL1eqK9qUhvbu+v7LjKefJfNGpnwNE252QlmFdM5tvikVD50LmKz8bHPzl5 3lG7+XofvYuFDSXvhmZc2X3ENWG3e9La7G1sEXuqWJBqXrY1fIuhoTrM/5EmSZhAxUhRQL OMKAuquNsRsmkIpRzDvoN715OhmrqPrv+ECvw/uML85ajdxJ0S1UO+aoqN1nPK5121OLOd 2Wijome8kLURasjkfq9++cmeNCbQC5a+QuVC6PiQgOAf+66wWiPJvzmNoOxHUZEp+dlSW9 Y/eEeq+Z7IrsbJIkYsZRJzAtQ3UsdJCuRD2QXjuOaJIFewXzgOWy+Hgsdsk8mA== 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 4Q0MGx18z1zNn9; Mon, 17 Apr 2023 09:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33H9UXMo051575; Mon, 17 Apr 2023 09:30:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H9UXIC051574; Mon, 17 Apr 2023 09:30:33 GMT (envelope-from git) Date: Mon, 17 Apr 2023 09:30:33 GMT Message-Id: <202304170930.33H9UXIC051574@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: ae458dac6c58 - main - japanese/sj3-server: work around duplicate symbol issue 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae458dac6c58fdc36ec47fe4bf65690b4175c55b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=ae458dac6c58fdc36ec47fe4bf65690b4175c55b commit ae458dac6c58fdc36ec47fe4bf65690b4175c55b Author: Robert Clausecker AuthorDate: 2023-04-16 13:51:08 +0000 Commit: Robert Clausecker 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