From nobody Sun Oct 17 07:59:21 2021 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 154121807A6C; Sun, 17 Oct 2021 07:59:22 +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 4HXC8B02Y1z4nKp; Sun, 17 Oct 2021 07:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D74001605; Sun, 17 Oct 2021 07:59:21 +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 19H7xLCJ040281; Sun, 17 Oct 2021 07:59:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19H7xLet040280; Sun, 17 Oct 2021 07:59:21 GMT (envelope-from git) Date: Sun, 17 Oct 2021 07:59:21 GMT Message-Id: <202110170759.19H7xLet040280@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Vin=C3=ADcius Zavam?= Subject: git: b1fe2ae52311 - main - net-mgmt/mk-livestatus: fix "ld: error: duplicate symbol: g_mainthread_id" 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: egypcio X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1fe2ae52311869265eb74a9940a1dd502bd1e74 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by egypcio: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1fe2ae52311869265eb74a9940a1dd502bd1e74 commit b1fe2ae52311869265eb74a9940a1dd502bd1e74 Author: Vinícius Zavam AuthorDate: 2021-10-17 07:53:55 +0000 Commit: Vinícius Zavam CommitDate: 2021-10-17 07:53:55 +0000 net-mgmt/mk-livestatus: fix "ld: error: duplicate symbol: g_mainthread_id" - add '-fcommon' to our CFLAGS in order to build with clang 11; - fix used by other ports as well (mentioned a few on original PR); - this is applied in a conditional way, checking OSVERSION; - while here, also added new DISTSITES. Reported by: dvl@, pkg-fallout PR: 257162 --- net-mgmt/mk-livestatus/Makefile | 18 ++++++++++++------ net-mgmt/mk-livestatus/distinfo | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/net-mgmt/mk-livestatus/Makefile b/net-mgmt/mk-livestatus/Makefile index 3a9224e5b7b4..4a21119a8ac0 100644 --- a/net-mgmt/mk-livestatus/Makefile +++ b/net-mgmt/mk-livestatus/Makefile @@ -2,9 +2,11 @@ PORTNAME= mk-livestatus PORTVERSION= 1.2.8p25 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt -MASTER_SITES= http://mathias-kettner.de/download/ +MASTER_SITES= https://mirrors.xtom.com/freebsd-ports/distfiles/check_mk/ \ + https://mirrors.xtom.nl/freebsd-ports/distfiles/check_mk/ \ + http://mathias-kettner.de/download/ DIST_SUBDIR= check_mk MAINTAINER= egypcio@FreeBSD.org @@ -12,9 +14,6 @@ COMMENT= Nagios event broker module LICENSE= GPLv2 -BROKEN_FreeBSD_13= ld: error: duplicate symbol: g_mainthread_id -BROKEN_FreeBSD_14= ld: error: duplicate symbol: g_mainthread_id - USES= compiler:c++11-lang GNU_CONFIGURE= yes @@ -61,4 +60,11 @@ post-install-EXAMPLES-on: ${PORTEXAMPLES:S|^|${WRKSRC}/api/python/|} ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/api/python/|} ${STAGEDIR}${EXAMPLESDIR} -.include +.include + +# Fix building with clang 11 ("ld: error: duplicate symbol: g_mainthread_id") +.if ${OSVERSION} >= 1300000 +CFLAGS+= -fcommon +.endif + +.include diff --git a/net-mgmt/mk-livestatus/distinfo b/net-mgmt/mk-livestatus/distinfo index 182cf8a75586..5f3b46109f00 100644 --- a/net-mgmt/mk-livestatus/distinfo +++ b/net-mgmt/mk-livestatus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1551174701 +TIMESTAMP = 1634456011 SHA256 (check_mk/mk-livestatus-1.2.8p25.tar.gz) = 3da53e234724517cd1ecbbd1dcdffb9a7dbbb325861fac9398e40ad6d1fdffe9 SIZE (check_mk/mk-livestatus-1.2.8p25.tar.gz) = 453525