From owner-svn-src-head@freebsd.org Sun Sep 9 17:26:45 2018 Return-Path: Delivered-To: svn-src-head@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 E0031109A040; Sun, 9 Sep 2018 17:26:45 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 967077ADE4; Sun, 9 Sep 2018 17:26:45 +0000 (UTC) (envelope-from emaste@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 915BE1CBE3; Sun, 9 Sep 2018 17:26:45 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w89HQjDm029254; Sun, 9 Sep 2018 17:26:45 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w89HQj5b029252; Sun, 9 Sep 2018 17:26:45 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201809091726.w89HQj5b029252@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 9 Sep 2018 17:26:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r338543 - in head/sbin: dhclient ping X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head/sbin: dhclient ping X-SVN-Commit-Revision: 338543 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Sep 2018 17:26:46 -0000 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