svn commit: r338543 - in head/sbin: dhclient ping

[Ed Maste]

Author: emaste
Date: Sun Sep  9 17:26:44 2018
New Revision: 338543
URL: https://svnweb.freebsd.org/changeset/base/338543

Log:
  Allow dhclient and ping to build WITHOUT_DYNAMICROOT
  
  dhclient and ping normally use libcasper services.  These are not
  available in statically-linked binaries, so when WITHOUT_DYNAMICROOT is
  set disable libcasper use, as with rescue builds.  Also emit a warning
  as it's undesirable to build this way.
  
  Reported by:	Michael Dexter
  Reviewed by:	rgrimes
  Tested by:	Michael Dexter
  Approved by:	re (kib)
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D17074

Modified:
  head/sbin/dhclient/Makefile
  head/sbin/ping/Makefile

Modified: head/sbin/dhclient/Makefile
==============================================================================
--- head/sbin/dhclient/Makefile	Sun Sep  9 17:12:31 2018	(r338542)
+++ head/sbin/dhclient/Makefile	Sun Sep  9 17:26:44 2018	(r338543)
@@ -44,7 +44,9 @@ MAN=	dhclient.8 dhclient.conf.5 dhclient.leases.5 dhcp
 	dhclient-script.8
 LIBADD=	util
 
-.if ${MK_CASPER} != "no" && !defined(RESCUE)
+.if ${MK_DYNAMICROOT} == "no"
+.warning ${PROG} built without libcasper support
+.elif ${MK_CASPER} != "no" && !defined(RESCUE)
 LIBADD+=        casper
 LIBADD+=        cap_syslog
 CFLAGS+=-DWITH_CASPER

Modified: head/sbin/ping/Makefile
==============================================================================
--- head/sbin/ping/Makefile	Sun Sep  9 17:12:31 2018	(r338542)
+++ head/sbin/ping/Makefile	Sun Sep  9 17:26:44 2018	(r338543)
@@ -11,7 +11,9 @@ BINMODE=4555
 WARNS?=	3
 LIBADD=	m
 
-.if ${MK_CASPER} != "no" && !defined(RESCUE)
+.if ${MK_DYNAMICROOT} == "no"
+.warning ${PROG} built without libcasper support
+.elif ${MK_CASPER} != "no" && !defined(RESCUE)
 LIBADD+=	casper
 LIBADD+=	cap_dns
 CFLAGS+=-DWITH_CASPER