From 536fada977b31f542da170f268eb468145ff0b52 Mon Sep 17 00:00:00 2001 From: Piotr Kubaj Date: Mon, 14 Oct 2019 10:58:19 +0000 Subject: [PATCH] sysutils/cbsd: fix build on GCC architectures Linking to C++ libraries compiled by GCC9 requires GCC9: /wrkdirs/usr/ports/sysutils/cbsd/work/cbsd-12.1.1/misc/src/dump_iscsi_discovery.c:171: undefined reference to `simpleXmlGetLineNumber' /wrkdirs/usr/ports/sysutils/cbsd/work/cbsd-12.1.1/misc/src/dump_iscsi_discovery.c:205: undefined reference to `simpleXmlGetLineNumber' /wrkdirs/usr/ports/sysutils/cbsd/work/cbsd-12.1.1/misc/src/dump_iscsi_discovery.c:215: undefined reference to `simpleXmlGetLineNumber' /wrkdirs/usr/ports/sysutils/cbsd/work/cbsd-12.1.1/misc/src/dump_iscsi_discovery.c:225: undefined reference to `simpleXmlGetLineNumber' Also, remove -mminimal-toc, not needed with the current version. Approved by: mentors (implicit approval), portmgr (removing architecture specific fixes) --- sysutils/cbsd/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index d46d2ec2173d..e5a61630ba97 100644 --- a/sysutils/cbsd/Makefile +++ b/sysutils/cbsd/Makefile @@ -18,12 +18,10 @@ RUN_DEPENDS= rsync:net/rsync \ LIB_DEPENDS= libssh2.so:security/libssh2 \ libsqlite3.so:databases/sqlite3 -USES= libedit pkgconfig:both +USES= compiler:c++11-lang libedit pkgconfig:both USE_GITHUB= yes USE_RC_SUBR= cbsdd cbsdrsyncd cbsd-statsd-bhyve cbsd-statsd-hoster cbsd-statsd-jail -CFLAGS_powerpc64= -mminimal-toc - SUB_FILES= pkg-message pkg-deinstall CBSD_HOME?= ${PREFIX}/cbsd