svn commit: r504242 - in head/net-mgmt/xymon-server: . files
Piotr Kubaj
pkubaj at FreeBSD.org
Sat Jun 15 12:59:25 UTC 2019
Author: pkubaj
Date: Sat Jun 15 12:59:24 2019
New Revision: 504242
URL: https://svnweb.freebsd.org/changeset/ports/504242
Log:
net-mgmt/xymon-server: fix build with GCC-based architectures
Adding -L/usr/lib when using gcc8 (used on GCC architectures) makes gcc8 link to base libstdc++ which breaks build.
Fix this by adding -L${OPENSSLBASE} only when using non-base SSL.
PR: 237956
Approved by: feld (maintainer timeout), linimon (mentor, on IRC)
Modified:
head/net-mgmt/xymon-server/Makefile
head/net-mgmt/xymon-server/files/Makefile
Modified: head/net-mgmt/xymon-server/Makefile
==============================================================================
--- head/net-mgmt/xymon-server/Makefile Sat Jun 15 12:43:48 2019 (r504241)
+++ head/net-mgmt/xymon-server/Makefile Sat Jun 15 12:59:24 2019 (r504242)
@@ -29,7 +29,7 @@ XYMONUSER?= xymon
XYMONHOSTNAME?= xymon.example.com
XYMONHOSTIP?= 127.0.0.1
-USES= cpe gmake shebangfix ssl
+USES= compiler:c11 cpe gmake shebangfix ssl
SHEBANG_FILES= ${WRKSRC}/xymond/xymonreports.sh.DIST ${WRKSRC}/build/upgrade430.sh
MAKE_JOBS_UNSAFE= yes
CONFIGURE_ENV= MAKE=gmake
Modified: head/net-mgmt/xymon-server/files/Makefile
==============================================================================
--- head/net-mgmt/xymon-server/files/Makefile Sat Jun 15 12:43:48 2019 (r504241)
+++ head/net-mgmt/xymon-server/files/Makefile Sat Jun 15 12:59:24 2019 (r504242)
@@ -60,9 +60,14 @@ DORRD = yes
#
# OpenSSL settings
SSLFLAGS = -DHAVE_OPENSSL
+
+ifneq (${OPENSSLLIB},/usr/lib)
SSLINCDIR = -I${OPENSSLINC}
SSLLIBS = -L${OPENSSLLIB} -lssl -lcrypto
RPATHVAL += ${OPENSSLLIB}
+else
+SSLLIBS = -lssl -lcrypto
+endif
DOSSL = yes
#
ifdef WITH_LDAP
@@ -70,7 +75,9 @@ ifdef WITH_LDAP
LDAPFLAGS = -DXYMON_LDAP -DXYMON_LDAP_USESTARTTLS -DHAVE_LDAP
LDAPINCDIR = -I${PREFIX}/include
LDAPLIBS = -L${PREFIX}/lib -lldap -llber
+ifneq (${OPENSSLLIB},/usr/lib)
RPATHVAL += ${PREFIX}/lib
+endif
RPATHVAL += /usr/local/lib
DOLDAP = yes
endif
More information about the svn-ports-head
mailing list