Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 22 Nov 2014 22:40:38 +0000 (UTC)
From:      Jun Kuriyama <kuriyama@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r373112 - head/net-mgmt/nagios-check_memcached_paranoid
Message-ID:  <201411222240.sAMMecdn044839@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kuriyama
Date: Sat Nov 22 22:40:37 2014
New Revision: 373112
URL: https://svnweb.freebsd.org/changeset/ports/373112
QAT: https://qat.redports.org/buildarchive/r373112/

Log:
  Add a hack to change linking objects which should be changed
  by net-mgmt/nagios-plugins OPTIONS setting.
  
  PR:		ports/187772
  Reported by:	Lukasz Wasikowski <lukasz@wasikowski.net>

Modified:
  head/net-mgmt/nagios-check_memcached_paranoid/Makefile

Modified: head/net-mgmt/nagios-check_memcached_paranoid/Makefile
==============================================================================
--- head/net-mgmt/nagios-check_memcached_paranoid/Makefile	Sat Nov 22 22:37:20 2014	(r373111)
+++ head/net-mgmt/nagios-check_memcached_paranoid/Makefile	Sat Nov 22 22:40:37 2014	(r373112)
@@ -27,6 +27,8 @@ do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${FILESDIR}/${FILE} ${WRKSRC}
 
+# HACK: Linking objects may be changed by nagios-plugins OPTIONS
+# setting (EXTRAOPTS, NLS).
 do-build:
 	cd ${WRKSRC}; \
 	NDIR=$$(${NDIR_CMD}); \
@@ -34,7 +36,8 @@ do-build:
 		-I$${NDIR} -I$${NDIR}/plugins -I$${NDIR}/gl -I$${NDIR}/lib -I${LOCALBASE}/include \
 		-o ${PORTNAME} \
 		$${NDIR}/plugins/netutils.o $${NDIR}/plugins/utils.o \
-		$${NDIR}/lib/utils_base.o $${NDIR}/lib/extra_opts.o $${NDIR}/lib/parse_ini.o \
+		$${NDIR}/lib/utils_base.o \
+		`ls $${NDIR}/lib/*.o | ${GREP} -E '(extra_opts|parse_ini).o$$'` \
 		$${NDIR}/gl/getopt.o $${NDIR}/gl/getopt1.o \
 		$${NDIR}/gl/idpriv-droptemp.o $${NDIR}/gl/sha1.o \
 		-L${LOCALBASE}/lib -lintl -lmemcached ${FILE}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411222240.sAMMecdn044839>