From owner-svn-ports-all@freebsd.org Sat Jun 15 12:59:25 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6CF5A15C6C6F; Sat, 15 Jun 2019 12:59:25 +0000 (UTC) (envelope-from pkubaj@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 100FE748B3; Sat, 15 Jun 2019 12:59:25 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DBDF72748F; Sat, 15 Jun 2019 12:59:24 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5FCxO0m099056; Sat, 15 Jun 2019 12:59:24 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5FCxOcX099055; Sat, 15 Jun 2019 12:59:24 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201906151259.x5FCxOcX099055@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Sat, 15 Jun 2019 12:59:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504242 - in head/net-mgmt/xymon-server: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/net-mgmt/xymon-server: . files X-SVN-Commit-Revision: 504242 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 100FE748B3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.958,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Jun 2019 12:59:25 -0000 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