git: b1fe2ae52311 - main - net-mgmt/mk-livestatus: fix "ld: error: duplicate symbol: g_mainthread_id"
Date: Sun, 17 Oct 2021 07:59:21 UTC
The branch main has been updated by egypcio:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b1fe2ae52311869265eb74a9940a1dd502bd1e74
commit b1fe2ae52311869265eb74a9940a1dd502bd1e74
Author: Vinícius Zavam <egypcio@FreeBSD.org>
AuthorDate: 2021-10-17 07:53:55 +0000
Commit: Vinícius Zavam <egypcio@FreeBSD.org>
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 <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+# Fix building with clang 11 ("ld: error: duplicate symbol: g_mainthread_id")
+.if ${OSVERSION} >= 1300000
+CFLAGS+= -fcommon
+.endif
+
+.include <bsd.port.post.mk>
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