Bug 137487 - [patch] [build] unbreak world WITHOUT_NETGRAPH
Summary: [patch] [build] unbreak world WITHOUT_NETGRAPH
Status: Closed FIXED
Alias: None
Product: Base System
Classification: Unclassified
Component: conf (show other bugs)
Version: Unspecified
Hardware: Any Any
: Normal Affects Only Me
Assignee: Antoine Brodin
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-08-06 16:20 UTC by bf
Modified: 2010-01-30 16:00 UTC (History)
0 users

See Also:

Attachments
file.diff (301 bytes, patch)
2009-08-06 16:20 UTC, bf 		no flags Details | Diff
usr_src_sys_modules_Makefile_diff.txt (509 bytes, text/plain; charset=US-ASCII)
2010-01-16 14:43 UTC, b. f. 		no flags Details
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description bf 2009-08-06 16:20:01 UTC 
WITHOUT_NETGRAPH=yes breaks the buildworld target when PPP_NO_NETGRAPH is not also defined:

..
mkdep -f .depend -a    -DNOINET6 -DNOATM /usr/src/usr.sbin/ppp/acf.c /usr/src/usr.sbin/ppp/arp.c /usr/src/usr.sbin/ppp/async.c /usr/src/usr.sbin/ppp/auth.c /usr/src/usr.sbin/ppp/bundle.c /usr/src/usr.sbin/ppp/cbcp.c /usr/src/usr.sbin/ppp/ccp.c /usr/src/usr.sbin/ppp/chap.c /usr/src/usr.sbin/ppp/chat.c /usr/src/usr.sbin/ppp/command.c /usr/src/usr.sbin/ppp/datalink.c /usr/src/usr.sbin/ppp/deflate.c /usr/src/usr.sbin/ppp/defs.c /usr/src/usr.sbin/ppp/exec.c /usr/src/usr.sbin/ppp/filter.c /usr/src/usr.sbin/ppp/fsm.c /usr/src/usr.sbin/ppp/hdlc.c /usr/src/usr.sbin/ppp/iface.c /usr/src/usr.sbin/ppp/ip.c /usr/src/usr.sbin/ppp/ipcp.c /usr/src/usr.sbin/ppp/ipv6cp.c /usr/src/usr.sbin/ppp/iplist.c /usr/src/usr.sbin/ppp/lcp.c /usr/src/usr.sbin/ppp/link.c /usr/src/usr.sbin/ppp/log.c /usr/src/usr.sbin/ppp/lqr.c /usr/src/usr.sbin/ppp/main.c /usr/src/usr.sbin/ppp/mbuf.c /usr/src/usr.sbin/ppp/mp.c /usr/src/usr.sbin/ppp/ncp.c /usr/src/usr.sbin/ppp/ncpaddr.c /usr/src/usr.sbin/ppp/pap.c /usr/src/us
 r.sbin/ppp/physical.c /usr/src/usr.sbin/ppp/pred.c /usr/src/usr.sbin/ppp/probe.c /usr/src/usr.sbin/ppp/prompt.c /usr/src/usr.sbin/ppp/proto.c /usr/src/usr.sbin/ppp/route.c /usr/src/usr.sbin/ppp/server.c /usr/src/usr.sbin/ppp/sig.c /usr/src/usr.sbin/ppp/slcompress.c /usr/src/usr.sbin/ppp/sync.c /usr/src/usr.sbin/ppp/systems.c /usr/src/usr.sbin/ppp/tcp.c /usr/src/usr.sbin/ppp/tcpmss.c /usr/src/usr.sbin/ppp/throughput.c /usr/src/usr.sbin/ppp/timer.c /usr/src/usr.sbin/ppp/tty.c /usr/src/usr.sbin/ppp/tun.c /usr/src/usr.sbin/ppp/udp.c /usr/src/usr.sbin/ppp/vjcomp.c /usr/src/usr.sbin/ppp/nat_cmd.c /usr/src/usr.sbin/ppp/id.c /usr/src/usr.sbin/ppp/chap_ms.c /usr/src/usr.sbin/ppp/mppe.c /usr/src/usr.sbin/ppp/radius.c /usr/src/usr.sbin/ppp/ether.c
/usr/src/usr.sbin/ppp/tty.c:46:22: error: netgraph.h: No such file or directory
/usr/src/usr.sbin/ppp/id.c:36:22: error: netgraph.h: No such file or directory
/usr/src/usr.sbin/ppp/ether.c:35:22: error: netgraph.h: No such file or directory
mkdep: compile failed
*** Error code 1

Stop in /usr/src/usr.sbin/ppp.
*** Error code 1

Stop in /usr/src/usr.sbin.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.

Fix: Patch attached with submission follows:
Comment 1 Antoine Brodin freebsd_committer freebsd_triage 2010-01-09 23:44:51 UTC 
Responsible Changed
From-To: freebsd-bugs->antoine

Take.
Comment 2 dfilter service freebsd_committer freebsd_triage 2010-01-16 12:20:40 UTC 
Author: antoine
Date: Sat Jan 16 12:20:26 2010
New Revision: 202440
URL: http://svn.freebsd.org/changeset/base/202440

Log:
  Unbreak world WITHOUT_NETGRAPH.
  
  PR:		137487
  Submitted by:	bf (previous version)
  No objections:	net@
  MFC after:	2 weeks

Modified:
  head/share/mk/bsd.own.mk
  head/usr.sbin/ppp/Makefile

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Sat Jan 16 12:18:44 2010	(r202439)
+++ head/share/mk/bsd.own.mk	Sat Jan 16 12:20:26 2010	(r202440)
@@ -468,6 +468,11 @@ MK_MAILWRAPPER:= no
 MK_SENDMAIL:=	no
 .endif
 
+.if ${MK_NETGRAPH} == "no"
+MK_ATM:=	no
+MK_BLUETOOTH:=	no
+.endif
+
 .if ${MK_OPENSSL} == "no"
 MK_OPENSSH:=	no
 MK_KERBEROS:=	no

Modified: head/usr.sbin/ppp/Makefile
==============================================================================
--- head/usr.sbin/ppp/Makefile	Sat Jan 16 12:18:44 2010	(r202439)
+++ head/usr.sbin/ppp/Makefile	Sat Jan 16 12:20:26 2010	(r202440)
@@ -25,6 +25,9 @@ PPP_NO_SUID=
 .if ${MK_ATM} == "no"
 PPP_NO_ATM=
 .endif
+.if ${MK_NETGRAPH} == "no"
+PPP_NO_NETGRAPH=
+.endif
 .if ${MK_PAM_SUPPORT} == "no"
 PPP_NO_PAM=
 .endif
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
Comment 3 Antoine Brodin freebsd_committer freebsd_triage 2010-01-16 12:31:24 UTC 
State Changed
From-To: open->patched

patched in head
Comment 4 b. f. 2010-01-16 14:43:56 UTC 
On 1/16/10, antoine@freebsd.org <antoine@freebsd.org> wrote:
> Synopsis: [patch] [build] unbreak world WITHOUT_NETGRAPH
>
> State-Changed-From-To: open->patched
> State-Changed-By: antoine
> State-Changed-When: Sat Jan 16 12:31:24 UTC 2010
> State-Changed-Why:
> patched in head
>
> http://www.freebsd.org/cgi/query-pr.cgi?pr=137487
>

Thanks. I wonder if, as in the case of WITHOUT_PF and
WITHOUT_IPFILTER, it makes much sense to build netgraph-related kernel
modules without netgraph support in the userland? I would suggest also
considering the change in the attached patch, which I forgot to put in
the PR.

Regards,
                b.
Comment 5 dfilter service freebsd_committer freebsd_triage 2010-01-30 15:40:20 UTC 
Author: antoine
Date: Sat Jan 30 15:40:00 2010
New Revision: 203196
URL: http://svn.freebsd.org/changeset/base/203196

Log:
  MFC r202440 to stable/8:
    Unbreak world WITHOUT_NETGRAPH.
  
    PR:		137487
    Submitted by:	bf (previous version)
    No objections:	net@

Modified:
  stable/8/share/mk/bsd.own.mk
  stable/8/usr.sbin/ppp/Makefile
Directory Properties:
  stable/8/share/mk/   (props changed)
  stable/8/usr.sbin/ppp/   (props changed)

Modified: stable/8/share/mk/bsd.own.mk
==============================================================================
--- stable/8/share/mk/bsd.own.mk	Sat Jan 30 15:28:14 2010	(r203195)
+++ stable/8/share/mk/bsd.own.mk	Sat Jan 30 15:40:00 2010	(r203196)
@@ -468,6 +468,11 @@ MK_MAILWRAPPER:= no
 MK_SENDMAIL:=	no
 .endif
 
+.if ${MK_NETGRAPH} == "no"
+MK_ATM:=	no
+MK_BLUETOOTH:=	no
+.endif
+
 .if ${MK_OPENSSL} == "no"
 MK_OPENSSH:=	no
 MK_KERBEROS:=	no

Modified: stable/8/usr.sbin/ppp/Makefile
==============================================================================
--- stable/8/usr.sbin/ppp/Makefile	Sat Jan 30 15:28:14 2010	(r203195)
+++ stable/8/usr.sbin/ppp/Makefile	Sat Jan 30 15:40:00 2010	(r203196)
@@ -25,6 +25,9 @@ PPP_NO_SUID=
 .if ${MK_ATM} == "no"
 PPP_NO_ATM=
 .endif
+.if ${MK_NETGRAPH} == "no"
+PPP_NO_NETGRAPH=
+.endif
 .if ${MK_PAM_SUPPORT} == "no"
 PPP_NO_PAM=
 .endif
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
Comment 6 Antoine Brodin freebsd_committer freebsd_triage 2010-01-30 15:59:43 UTC 
State Changed
From-To: patched->closed

Thanks for the report, this is fixed in head and stable/8.