Page MenuHomeFreeBSD
Differential D4589

Move the MAKEOBJDIRPREFIX value guard to sys.mk and expand to MAKEOBJDIR.
Needs ReviewPublic
Actions

Authored by bdrewery on Dec 15 2015, 8:55 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Feb 22, 6:12 PM
Unknown Object (File)
Tue, Feb 11, 10:39 PM
Unknown Object (File)
Jan 29 2025, 9:44 AM
Unknown Object (File)
Jan 28 2025, 4:08 PM
Unknown Object (File)
Jan 9 2025, 11:29 AM
Unknown Object (File)
Dec 19 2024, 11:55 PM
Unknown Object (File)
Nov 21 2024, 3:51 PM
Unknown Object (File)
Oct 16 2024, 9:03 PM
View All 45 Files
Subscribers
emaste

Details

Reviewers
sjg
bapt
imp
Summary

This will ensure that the variable was not set as a make override, in
make.conf, src.conf or src-env.conf. It allows setting the value in
src-env.conf when using WITH_AUTO_OBJ since that case properly handles
changing .OBJDIR (except if MAKEOBJDIRPREFIX does not yet exist which is
being discussed to be changed).

This change allows setting a default MAKEOBJDIRPREFIX via local.sys.env.mk.

Sponsored by: EMC / Isilon Storage Division

Test Plan

Modifying src-env.conf, src.conf, make.conf, env, makeargs with
and without WITH_AUTO_OBJ.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 1684
Build 1690: arc lint + arc unit

Event Timeline

bdrewery updated this revision to Diff 11329.Dec 15 2015, 8:55 PM
bdrewery retitled this revision from to Move the MAKEOBJDIRPREFIX value guard to sys.mk and expand to MAKEOBJDIR..
bdrewery updated this object.
bdrewery edited the test plan for this revision. (Show Details)
bdrewery added reviewers: sjg, bapt, imp.
Herald added a subscriber: emaste. · View Herald TranscriptDec 15 2015, 8:55 PM
sjg edited edge metadata.Dec 16 2015, 1:37 AM

I don't think this is an appropriate change to sys.mk
It is perfectly valid to want to do make MAKEOBJDIRPREFIX=/som/dir
the fact that that causes problems for src/Makefile.inc1 does not make it something that sys.mk should block.
This test would be more appropriate in src/Makefile or src/Makefile.inc1 since they are the only ones that should care

bdrewery added a comment.Jan 8 2016, 11:47 PM
In D4589#96796, @sjg wrote:

I don't think this is an appropriate change to sys.mk
It is perfectly valid to want to do make MAKEOBJDIRPREFIX=/som/dir
the fact that that causes problems for src/Makefile.inc1 does not make it something that sys.mk should block.
This test would be more appropriate in src/Makefile or src/Makefile.inc1 since they are the only ones that should care

Nothing here is preventing someone from modifying it. The intent is to prevent it being set where it won't actually work. It doesn't work in make.conf or cmdline as we never use .OBJDIR to change to it, we rely on make picking it up from the environment. And then we also rely on make's logic that the directory exists.

sjg added a comment.Jan 9 2016, 1:58 AM
In D4589#102769, @bdrewery wrote:
In D4589#96796, @sjg wrote:

I don't think this is an appropriate change to sys.mk
It is perfectly valid to want to do make MAKEOBJDIRPREFIX=/som/dir
the fact that that causes problems for src/Makefile.inc1 does not make it something that sys.mk should block.
This test would be more appropriate in src/Makefile or src/Makefile.inc1 since they are the only ones that should care

Nothing here is preventing someone from modifying it. The intent is to prevent it being set where it won't actually work. It doesn't work in make.conf or cmdline as we never use .OBJDIR to change to it, we rely on make picking it up from the environment. And then we also rely on make's logic that the directory exists.

The change to sys.mk says it is an error to do 'make MAKEOBJDIRPREFIX=/blah' it isn't, that is perfectly valid syntax. That is causes proplem for src/Makefile means it should be detected and dealt with there.
/usr/share/mk/ is supposed to work for things other than src.

Revision Contents
Changeset List

PathSize
7 lines
share/
mk/
19 lines

Diff 11329

View Options

Makefile

Show First 20 Lines • Show All 143 Lines • ▼ Show 20 Lines#ifdef RSS
.nh_policy = NETISR_POLICY_CPU, .nh_policy = NETISR_POLICY_CPU,
.nh_dispatch = NETISR_DISPATCH_HYBRID, .nh_dispatch = NETISR_DISPATCH_HYBRID,
#else #else
.nh_policy = NETISR_POLICY_FLOW, .nh_policy = NETISR_POLICY_FLOW,
#endif #endif
}; };
#ifdef RSS #ifdef RSS
/*
* Directly dispatched frames are currently assumed
* to have a flowid already calculated.
*
* It should likely have something that assert it
* actually has valid flow details.
*/
static struct netisr_handler ip_direct_nh = { static struct netisr_handler ip_direct_nh = {
.nh_name = "ip_direct", .nh_name = "ip_direct",
.nh_handler = ip_direct_input, .nh_handler = ip_direct_input,
.nh_proto = NETISR_IP_DIRECT, .nh_proto = NETISR_IP_DIRECT,
.nh_m2cpuid = rss_soft_m2cpuid_v4, .nh_m2cpuid = rss_soft_m2cpuid_v4,
.nh_policy = NETISR_POLICY_CPU, .nh_policy = NETISR_POLICY_CPU,
.nh_dispatch = NETISR_DISPATCH_HYBRID, .nh_dispatch = NETISR_DISPATCH_HYBRID,
}; };
▲ Show 20 Lines • Show All 1,169 Lines • Show Last 20 Lines
View Options

share/mk/sys.mk

Loading...