git: 747e2e324cb9 - main - net-mgmt/mk-livestatus: Remove OSVERSION conditionals
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 29 Sep 2023 19:05:21 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=747e2e324cb9f8c96514c37f59934c771bd0ae71
commit 747e2e324cb9f8c96514c37f59934c771bd0ae71
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-09-29 18:55:57 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-09-29 19:05:07 +0000
net-mgmt/mk-livestatus: Remove OSVERSION conditionals
Minimum supported OSVERSION is 120400 by the port infrastructure so no
need for additional conditions.
Approved by: portmgr (blanket)
---
net-mgmt/mk-livestatus/Makefile | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/net-mgmt/mk-livestatus/Makefile b/net-mgmt/mk-livestatus/Makefile
index dcb1a6aa7330..97f7d340cefd 100644
--- a/net-mgmt/mk-livestatus/Makefile
+++ b/net-mgmt/mk-livestatus/Makefile
@@ -29,6 +29,8 @@ EXAMPLE_FILES= example_multisite.py example.py \
# parameter "command_file" from nagios.cfg
COMMAND_FILE?= /var/spool/nagios/rw/live
+CFLAGS+= -fcommon
+
OPTIONS_DEFINE= EXAMPLES PERL
OPTIONS_SINGLE= NAGIOS
OPTIONS_SINGLE_NAGIOS= NAGIOS3 NAGIOS4
@@ -59,11 +61,4 @@ post-install-EXAMPLES-on:
${PORTEXAMPLES:S|^|${WRKSRC}/api/python/|}
${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/api/python/|} ${STAGEDIR}${EXAMPLESDIR}
-.include <bsd.port.pre.mk>
-
-# Fix building with clang 11 ("ld: error: duplicate symbol: g_mainthread_id")
-.if ${OSVERSION} >= 1204000
-CFLAGS+= -fcommon
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>