Re: CURRENT breakage in usr.sbin/amd/mk-amd-map
On Wed, Mar 21, 2001 at 03:13:42PM +1100, Bruce Evans wrote:
[...]
> Only the amd ones are broken. The bug is in ../Makefile.inc. It spams
> ${SRCS} with some nfs headers. This breaks 's automatic
> setting of ${SRCS} from ${PROG}. SRCS should be under the control of
> individual Makefiles except for the default in .
>
> This bug also causes bogus setting and building of nfs headers in amd
> subdirs that don't have any C sources and/or don't need any nfs headers,
> e.g. in the scripts subdir.
>
Fixed now, sorry.
Cheers,
--
Ruslan Ermilov Oracle Developer/DBA,
[EMAIL PROTECTED] Sunbay Software AG,
[EMAIL PROTECTED] FreeBSD committer,
+380.652.512.251Simferopol, Ukraine
http://www.FreeBSD.org The Power To Serve
http://www.oracle.com Enabling The Information Age
To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message
Re: CURRENT breakage in usr.sbin/amd/mk-amd-map
On Tue, Mar 20, 2001 at 07:07:35PM -0800, Peter Wemm scribbled: | "Michael C . Wu" wrote: I just committed a fix that should unbreak world. Please let me know if there are any problems. It is a trivial mistake that could been spared by a little testing. Thanks Bruce M., Peter, Warner, and Bruce E. :) Michael -- +---+ | [EMAIL PROTECTED] | [EMAIL PROTECTED] | | http://iteration.net/~keichii | Yes, BSD is a conspiracy. | +---+ To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: CURRENT breakage in usr.sbin/amd/mk-amd-map
If memory serves me right, Peter Wemm wrote:
> If SRCS is undefined, then SRCS=${PROG}.c. ie:
>
> peter@daintree[7:30pm]~src/usr.sbin/sicontrol-283> grep SRCS Makefile
> peter@daintree[7:30pm]~src/usr.sbin/sicontrol-284> make -V SRCS
> sicontrol.c
> peter@daintree[7:30pm]~src/usr.sbin/sicontrol-285> make -V PROG
> sicontrol
>
> Adding back SRCS=prog.c explicitly is not the solution. It is just hiding
> a problem elsewhere.
[snip]
Thanks for the clue. I learned something new today. (Unfortunately,
not enough to fix the problem, but I bet one of you -CURRENT gods can
come up with a fix.)
Cheers,
Bruce.
PGP signature
Re: CURRENT breakage in usr.sbin/amd/mk-amd-map
On Tue, 20 Mar 2001, Bruce A. Mah wrote:
> If memory serves me right, "Michael C . Wu" wrote:
>
> > cvs diff: Diffing .
> > Index: Makefile
> > ===
> > RCS file: /home/ncvs/src/usr.sbin/amd/mk-amd-map/Makefile,v
> > retrieving revision 1.11
> > diff -u -r1.11 Makefile
> > --- Makefile2001/03/20 18:16:16 1.11
> > +++ Makefile2001/03/20 21:37:46
> > @@ -8,6 +8,10 @@
> >
> > .PATH: ${.CURDIR}/../../../contrib/amd/mk-amd-map
> >
> > +MAN8= mk-amd-map.8
> > +
> > +SRCS= mk-amd-map.c
> > +
> > PROG= mk-amd-map
> >
> > .include
>
> That reverts all of Ruslan's change. You don't want to put the MAN8=
> definition back, because that was the point of his commit. Just the
> SRCS= needs to be reverted.
It doesn't quite revert them. It also adds 2 style bugs (1 more blank
line and perfect disordering of the macros (the normal order is
PROG, [SRCS], [MAN*]).
> Now Ruslan (or someone) needs to go and fix all of these files too:
>
> src/usr.sbin/amd/wire-test/Makefile
> src/usr.sbin/ancontrol/Makefile
> src/usr.sbin/usbdevs/Makefile
> src/usr.sbin/wicontrol/Makefile
> src/usr.sbin/wlconfig/Makefile
Only the amd ones are broken. The bug is in ../Makefile.inc. It spams
${SRCS} with some nfs headers. This breaks 's automatic
setting of ${SRCS} from ${PROG}. SRCS should be under the control of
individual Makefiles except for the default in .
This bug also causes bogus setting and building of nfs headers in amd
subdirs that don't have any C sources and/or don't need any nfs headers,
e.g. in the scripts subdir.
Bruce
To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message
Re: CURRENT breakage in usr.sbin/amd/mk-amd-map
"Bruce A. Mah" wrote:
> --==_Exmh_-1701844519P
> Content-Type: text/plain; charset=us-ascii
>
> If memory serves me right, Peter Wemm wrote:
> > "Michael C . Wu" wrote:
> > > On Tue, Mar 20, 2001 at 04:13:17PM -0600, Michael C . Wu scribbled:
> > > | On Tue, Mar 20, 2001 at 02:03:29PM -0800, Bruce A. Mah scribbled:
> > >
> > >
> > > I have just finished making the patch to fix this problem.
> > > I will start the buildworld now. In the mean time,
> > > if someone has a fast box, please test the patch at
> > >
> > > http://people.freebsd.org/~keichii/fix-current-broken-man-build.diff
> >
> > I kinda object to backing this stuff out. The problem is elsewhere. This
> > stuff builds correctly on its own, it is something wrong with the world
> > environment. eg: do a 'make install' in src/share/mk and the world works
> > fine. Since this seems to be needed, the problem is in 'world', not these
> > makefiles.
>
> Huh?!?
>
> Ruslan's commit was intended to remove (most of the) MAN8= definitions
> in certain Makefiles. That's great.
>
> Unfortunately, in some cases, he also removed SRCS= definitions, which is
> not so good inasmuch as it breaks buildworld. Either he deleted too
> much out of the Makefiles, or the SRCS= removal was intentional and
> should have been documented in the commit message (as far as I can tell
> this has *nothing* to do with manpages).
>
> Michael's patch (which unbreaks buildworld) only backs out the SRCS=
> changes.
>
> Feel free to hand me a giant clue if I'm missing something really
> obvious. In other words, is world *supposed* to build in the absence of
> SRCS= definitions?
>
> Bruce.
If SRCS is undefined, then SRCS=${PROG}.c. ie:
peter@daintree[7:30pm]~src/usr.sbin/sicontrol-283> grep SRCS Makefile
peter@daintree[7:30pm]~src/usr.sbin/sicontrol-284> make -V SRCS
sicontrol.c
peter@daintree[7:30pm]~src/usr.sbin/sicontrol-285> make -V PROG
sicontrol
Adding back SRCS=prog.c explicitly is not the solution. It is just hiding
a problem elsewhere.
We use this extensively elsewhere, eg:
peter@daintree[7:31pm]~src/bin/cat-290> cat Makefile
# @(#)Makefile8.1 (Berkeley) 5/31/93
# $FreeBSD: src/bin/cat/Makefile,v 1.5 1999/08/27 23:13:32 peter Exp $
PROG= cat
.include
Right now, the problem appears to be src/usr.sbin/amd/* only.
The amd/Makefile.inc has: SRCS+= config_local.h etc.
This stops the
.if !defined(SRCS)
SRCS=${PROG}.c
.endif
in bsd.prog.mk from working.
peter@daintree[7:36pm]~src/usr.sbin/amd/mk-amd-map-112> make -V SRCS
config_local.h mount.h nfs_prot.h
ie: bsd.prog.mk never gets around to providing the base definition of SRCS.
Cheers,
-Peter
--
Peter Wemm - [EMAIL PROTECTED]; [EMAIL PROTECTED]; [EMAIL PROTECTED]
"All of this is for nothing if we don't go to the stars" - JMS/B5
To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message
Re: CURRENT breakage in usr.sbin/amd/mk-amd-map
If memory serves me right, Peter Wemm wrote: > "Michael C . Wu" wrote: > > On Tue, Mar 20, 2001 at 04:13:17PM -0600, Michael C . Wu scribbled: > > | On Tue, Mar 20, 2001 at 02:03:29PM -0800, Bruce A. Mah scribbled: > > > > > > I have just finished making the patch to fix this problem. > > I will start the buildworld now. In the mean time, > > if someone has a fast box, please test the patch at > > > > http://people.freebsd.org/~keichii/fix-current-broken-man-build.diff > > I kinda object to backing this stuff out. The problem is elsewhere. This > stuff builds correctly on its own, it is something wrong with the world > environment. eg: do a 'make install' in src/share/mk and the world works > fine. Since this seems to be needed, the problem is in 'world', not these > makefiles. Huh?!? Ruslan's commit was intended to remove (most of the) MAN8= definitions in certain Makefiles. That's great. Unfortunately, in some cases, he also removed SRCS= definitions, which is not so good inasmuch as it breaks buildworld. Either he deleted too much out of the Makefiles, or the SRCS= removal was intentional and should have been documented in the commit message (as far as I can tell this has *nothing* to do with manpages). Michael's patch (which unbreaks buildworld) only backs out the SRCS= changes. Feel free to hand me a giant clue if I'm missing something really obvious. In other words, is world *supposed* to build in the absence of SRCS= definitions? Bruce. PGP signature
Re: CURRENT breakage in usr.sbin/amd/mk-amd-map
If memory serves me right, "Michael C . Wu" wrote: > On Tue, Mar 20, 2001 at 04:13:17PM -0600, Michael C . Wu scribbled: > | On Tue, Mar 20, 2001 at 02:03:29PM -0800, Bruce A. Mah scribbled: > > > I have just finished making the patch to fix this problem. > I will start the buildworld now. In the mean time, > if someone has a fast box, please test the patch at > > http://people.freebsd.org/~keichii/fix-current-broken-man-build.diff I just finished a buildworld (but can't do an installworld...I'm 30 miles from the console), all seems well with the diffs. Thanks much for generating the patch. I normally don't like leaving other people to clean up problems I find, but almost anyone would be able to do it faster than me, at the moment. Cheers, Bruce. PGP signature
Re: CURRENT breakage in usr.sbin/amd/mk-amd-map
"Michael C . Wu" wrote: > On Tue, Mar 20, 2001 at 04:13:17PM -0600, Michael C . Wu scribbled: > | On Tue, Mar 20, 2001 at 02:03:29PM -0800, Bruce A. Mah scribbled: > > > I have just finished making the patch to fix this problem. > I will start the buildworld now. In the mean time, > if someone has a fast box, please test the patch at > > http://people.freebsd.org/~keichii/fix-current-broken-man-build.diff I kinda object to backing this stuff out. The problem is elsewhere. This stuff builds correctly on its own, it is something wrong with the world environment. eg: do a 'make install' in src/share/mk and the world works fine. Since this seems to be needed, the problem is in 'world', not these makefiles. Cheers, -Peter -- Peter Wemm - [EMAIL PROTECTED]; [EMAIL PROTECTED]; [EMAIL PROTECTED] "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: CURRENT breakage in usr.sbin/amd/mk-amd-map
On Tue, Mar 20, 2001 at 04:13:17PM -0600, Michael C . Wu scribbled: | On Tue, Mar 20, 2001 at 02:03:29PM -0800, Bruce A. Mah scribbled: I have just finished making the patch to fix this problem. I will start the buildworld now. In the mean time, if someone has a fast box, please test the patch at http://people.freebsd.org/~keichii/fix-current-broken-man-build.diff -- +---+ | [EMAIL PROTECTED] | [EMAIL PROTECTED] | | http://iteration.net/~keichii | Yes, BSD is a conspiracy. | +---+ To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: CURRENT breakage in usr.sbin/amd/mk-amd-map
If memory serves me right, "Michael C . Wu" wrote:
> cvs diff: Diffing .
> Index: Makefile
> ===
> RCS file: /home/ncvs/src/usr.sbin/amd/mk-amd-map/Makefile,v
> retrieving revision 1.11
> diff -u -r1.11 Makefile
> --- Makefile2001/03/20 18:16:16 1.11
> +++ Makefile2001/03/20 21:37:46
> @@ -8,6 +8,10 @@
>
> .PATH: ${.CURDIR}/../../../contrib/amd/mk-amd-map
>
> +MAN8= mk-amd-map.8
> +
> +SRCS= mk-amd-map.c
> +
> PROG= mk-amd-map
>
> .include
That reverts all of Ruslan's change. You don't want to put the MAN8=
definition back, because that was the point of his commit. Just the
SRCS= needs to be reverted.
Now Ruslan (or someone) needs to go and fix all of these files too:
src/usr.sbin/amd/wire-test/Makefile
src/usr.sbin/ancontrol/Makefile
src/usr.sbin/usbdevs/Makefile
src/usr.sbin/wicontrol/Makefile
src/usr.sbin/wlconfig/Makefile
There may be others, these were just selected files that I checked
(buildworld found the first one for me).
I'm definitely not going to get my -CURRENT machine rebuilt today. :-p
Bruce.
PGP signature
Re: CURRENT breakage in usr.sbin/amd/mk-amd-map
On Tue, Mar 20, 2001 at 02:03:29PM -0800, Bruce A. Mah scribbled: | That reverts all of Ruslan's change. You don't want to put the MAN8= | definition back, because that was the point of his commit. Just the | SRCS= needs to be reverted. | | Now Ruslan (or someone) needs to go and fix all of these files too: | | src/usr.sbin/amd/wire-test/Makefile | src/usr.sbin/ancontrol/Makefile | src/usr.sbin/usbdevs/Makefile | src/usr.sbin/wicontrol/Makefile | src/usr.sbin/wlconfig/Makefile I'll do it in about two hours when I get back from class if Ruslan does not wake up by then. :-p | There may be others, these were just selected files that I checked | (buildworld found the first one for me). | | I'm definitely not going to get my -CURRENT machine rebuilt today. :-p -- +---+ | [EMAIL PROTECTED] | [EMAIL PROTECTED] | | http://iteration.net/~keichii | Yes, BSD is a conspiracy. | +---+ To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message
Re: CURRENT breakage in usr.sbin/amd/mk-amd-map
In message <[EMAIL PROTECTED]> "Michael C . Wu" writes:
: I think a unified diff is easier to read. How about this one? :)
: [Warning: cut-n-paste diff]
:
: cvs diff: Diffing .
: Index: Makefile
: ===
: RCS file: /home/ncvs/src/usr.sbin/amd/mk-amd-map/Makefile,v
: retrieving revision 1.11
: diff -u -r1.11 Makefile
: --- Makefile2001/03/20 18:16:16 1.11
: +++ Makefile2001/03/20 21:37:46
: @@ -8,6 +8,10 @@
:
: .PATH: ${.CURDIR}/../../../contrib/amd/mk-amd-map
:
: +MAN8= mk-amd-map.8
: +
: +SRCS= mk-amd-map.c
: +
: PROG= mk-amd-map
:
: .include
Forget the blank lines, since they don't follow bde's unwritten
Makefile style rules. Eg, the rest of the tree doesn't do that.
Warner
To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message
Re: CURRENT breakage in usr.sbin/amd/mk-amd-map
On Tue, Mar 20, 2001 at 12:41:08PM -0800, Bruce A. Mah scribbled:
| This is a first for me, I think...finding a CURRENT buildworld bogon.
| Freshly cvsup-ed -CURRENT system, trying to buildworld:
|
| [much output]
|
| ===> usr.sbin/amd/mk-amd-map
| Diffs show that someone was perhaps a little overzealous in a
| manpage-related cleanup:
|
I think a unified diff is easier to read. How about this one? :)
[Warning: cut-n-paste diff]
cvs diff: Diffing .
Index: Makefile
===
RCS file: /home/ncvs/src/usr.sbin/amd/mk-amd-map/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile2001/03/20 18:16:16 1.11
+++ Makefile2001/03/20 21:37:46
@@ -8,6 +8,10 @@
.PATH: ${.CURDIR}/../../../contrib/amd/mk-amd-map
+MAN8= mk-amd-map.8
+
+SRCS= mk-amd-map.c
+
PROG= mk-amd-map
.include
--
+---+
| [EMAIL PROTECTED] | [EMAIL PROTECTED] |
| http://iteration.net/~keichii | Yes, BSD is a conspiracy. |
+---+
To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message
