Page MenuHomeFreeBSD
Differential D1410

Fix buildworld when cross-building and MK_INFO == yes
ClosedPublic
Actions

Authored by bapt on Jan 2 2015, 5:03 AM.
Tags
None
Referenced Files
F104187013: D1410.id2963.diff
Wed, Dec 4, 12:36 PM
Unknown Object (File)
Thu, Nov 28, 2:27 PM
Unknown Object (File)
Thu, Nov 28, 2:27 PM
Unknown Object (File)
Thu, Nov 28, 2:27 PM
Unknown Object (File)
Thu, Nov 28, 2:27 PM
Unknown Object (File)
Thu, Nov 28, 2:27 PM
Unknown Object (File)
Thu, Nov 28, 2:26 PM
Unknown Object (File)
Thu, Nov 28, 2:05 PM
View All Files
Subscribers
emaste

Details

Reviewers
dim
ngie
bapt
imp
bdrewery
Summary

Fix buildworld when cross-building and MK_INFO == yes

build-tools doesn't have consistent install logic, so to avoid disrupting that
I chose to move compiling texinfo from build-tools to bootstrap-tools. This is
a misnomer and I'd like to resolve that item sometime in the near future if
possible.

This commit adds a new knob, MK_INFO_SUPPORT, and builds texinfo depending on
whether or not that knob is set

Test Plan
% make tinderbox -DMAKE_JUST_WORLDS JFLAG=-j6 TARGETS="mips powerpc" \
               TARGET_ARCHES_mips=mipsel TARGET_ARCHES_powerpc=powerpc

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

ngie updated this revision to Diff 2948.Jan 2 2015, 5:03 AM
ngie retitled this revision from to Fix buildworld when cross-building and MK_INFO == yes.
ngie updated this object.
ngie edited the test plan for this revision. (Show Details)
ngie added a reviewer: dim.
ngie added subscribers: emaste, imp.
Herald added a reviewer: bdrewery. · View Herald TranscriptJan 2 2015, 5:03 AM
ngie edited the test plan for this revision. (Show Details)Jan 2 2015, 5:04 AM
ngie edited edge metadata.
ngie added a reviewer: bapt.Jan 2 2015, 7:57 PM
ngie updated this revision to Diff 2956.Jan 2 2015, 8:00 PM
ngie edited the test plan for this revision. (Show Details)

Update the diff post-bapt's commits to remove texinfo from base on head

This diff doesn't make sense on head, but will make sense as a direct
commit to stable/9 and stable/10

ngie updated this revision to Diff 2957.Jan 2 2015, 8:00 PM

Remove orphaned build knob from tools/build/options

imp added a comment.Jan 2 2015, 8:05 PM

OBE. You should abandon this, no?

imp added a comment.Jan 2 2015, 8:09 PM

Even in -stable, you need to define the _SUPPORT variables correctly....

Makefile.inc1
236

This is bogus. You need to define in the same file that MK_INFO is defined.

249–252

This isn't needed.

1304

This doesn't appear to be defined in src.opts.mk or bsd.opts.mk. Why not?

ngie abandoned this revision.Jan 2 2015, 8:14 PM

It seems like some revisions weren't backported to stable/10 for setting MK_INFO=no / -DNO_INFO, so I'm going to abandon/simplify this revision.

Makefile.inc1
236

Ok

1304

I was trying to keep the diff minimal, but I can add it to bsd.own.mk on stable/10.

bapt edited edge metadata.Jan 2 2015, 8:18 PM

May be it should not be named MK_INFO_SUPPORT as it is not a real option but something to workaround the fact that MK_INFO=no is part of NO_FUN

Rename MK_INFO_SUPPORT into an internal _BOOTSTRAP_MAKEINFO or something like this so it does not appear as an option but really looks like an internal variable

@imp what do you think?

ngie added a comment.Jan 2 2015, 8:39 PM
In D1410#16, @bapt wrote:

May be it should not be named MK_INFO_SUPPORT as it is not a real option but something to workaround the fact that MK_INFO=no is part of NO_FUN

Rename MK_INFO_SUPPORT into an internal _BOOTSTRAP_MAKEINFO or something like this so it does not appear as an option but really looks like an internal variable

@imp what do you think?

I don't think it's necessary because bootstrap-tools isn't build with MK_INFO=no / -DNO_INFO on stable/10...

bapt commandeered this revision.Jan 2 2015, 8:41 PM
bapt reclaimed this revision.
bapt edited reviewers, added: ngie; removed: bapt.
bapt updated this revision to Diff 2962.Jan 2 2015, 8:42 PM

Here is what I was talking about

bapt added a comment.Jan 2 2015, 8:44 PM

From my testing MK_INFO is always set to know on stable/10

bapt added a reviewer: imp.Jan 2 2015, 8:45 PM
bapt removed a subscriber: imp.
ngie added inline comments.Jan 2 2015, 8:45 PM
Makefile.inc1
236

This isn't needed. Just put it in BMAKE.

251

Please capitalize _bootstrap_makeinfo for consistency.

1315

Why ?=?

1348

Please put _texinfo before that so it's easier to MFC changes and is in alphabetical order.

ngie added inline comments.Jan 2 2015, 8:49 PM
Makefile.inc1
236

Please ignore this comment. It's needed...

bapt added a comment.Jan 2 2015, 8:49 PM

I'll update the patch

Makefile.inc1
236

This is needed otherwise _bootstrap_makeinfo is not defined while hitting the .if the first time resulting in a make(1) failure

bapt updated this revision to Diff 2963.Jan 2 2015, 8:52 PM

Update according to @ngie comment

bapt accepted this revision.Jan 2 2015, 9:16 PM
bapt added a reviewer: bapt.

@imp approved by irc

This revision is now accepted and ready to land.Jan 2 2015, 9:16 PM
bapt closed this revision.Jan 2 2015, 9:16 PM
ngie edited edge metadata.Jan 2 2015, 10:43 PM

LGTM!

Revision Contents
Changeset List

PathSize
21 lines

Diff 2963

View Options

Makefile.inc1

Loading...