Page MenuHomeFreeBSD
Differential D6805

Extract suffix rules into bsd.suffixes[-posix].mk.
ClosedPublic
Actions

Authored by jonathan on Jun 11 2016, 1:28 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mar 19 2024, 5:06 PM
Unknown Object (File)
Mar 19 2024, 3:29 PM
Unknown Object (File)
Mar 19 2024, 3:21 PM
Unknown Object (File)
Mar 19 2024, 2:03 PM
Unknown Object (File)
Mar 12 2024, 9:42 AM
Unknown Object (File)
Feb 4 2024, 5:23 AM
Unknown Object (File)
Jan 21 2024, 9:28 PM
Unknown Object (File)
Jan 11 2024, 10:30 AM
View All 84 Files
Subscribers
emaste
imp

Details

Reviewers
brooks
sjg
des
bdrewery
rwatson
Commits
rS307075: Extract suffix rules into bsd.suffixes[-posix].mk.
Summary

Refactor make suffix rules into separate files (one for POSIX and one not),
and rationalise the rules so that bsd.lib.mk can contain only those rules
that are library-specific (.c.po and .c.So).

This can be accomplished by adding ${STATIC_CFLAGS} to the .c.o rule
unconditionally. STATIC_CFLAGS are only defined for use by sys.mk rules in
lib/libpam/Makefile.inc (see r227797), so it should (should?) be safe to
include them unconditionally in sys.mk's .c.o rule.

Diff Detail

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

Event Timeline

jonathan updated this revision to Diff 17502.Jun 11 2016, 1:28 AM
jonathan retitled this revision from to Extract suffix rules into bsd.suffixes[-posix].mk..
jonathan updated this object.
jonathan edited the test plan for this revision. (Show Details)
jonathan added reviewers: sjg, brooks, des, bdrewery, rwatson.
Herald added subscribers: emaste, imp. · View Herald TranscriptJun 11 2016, 1:28 AM
sjg added inline comments.Jun 11 2016, 1:55 AM
share/mk/bsd.lib.mk
93

This is insufficient.
You need to either remove the clearing of .SUFFIXES, or re-include the appropriate suffix.mk

jonathan added inline comments.Jun 11 2016, 2:18 AM
share/mk/bsd.lib.mk
93

Ah, yes. I've tried removing the clear .SUFFIXES: line and have kicked off a universe build to see what the overall fallout of this change is. Hopefully there will be results in the morning. :)

bdrewery requested changes to this revision.Jun 13 2016, 4:36 PM
bdrewery edited edge metadata.

Please also get a ports exp-run before committing this

share/mk/sys.mk
261

This too needs to be added to share/mk/Makefile.

266

You need to add this file to share/mk/Makefile so it is installed to /usr/share/mk.

This revision now requires changes to proceed.Jun 13 2016, 4:36 PM
jonathan updated this revision to Diff 17641.Jun 16 2016, 6:14 PM
jonathan edited edge metadata.
  • Add bsd.suffixes[-posix].mk to share/mk/Makefile.
jonathan marked 2 inline comments as done.Jun 16 2016, 6:14 PM

Thanks, I've added those to share/mk/Makefile and will request an exp-run.

jonathan updated this revision to Diff 17649.Jun 16 2016, 11:09 PM
jonathan edited edge metadata.
  • Move .SUFFIXES definitions into suffix rule files, too.
jonathan updated this revision to Diff 17650.Jun 17 2016, 12:40 AM
  • Extract suffix rules into bsd.suffixes[-posix].mk.
  • Add bsd.suffixes[-posix].mk to share/mk/Makefile.
  • Don't clear suffix rules in bsd.lib.mk.
jonathan added a comment.Oct 6 2016, 12:37 AM

Ping!

Not that we're well clear of code freezes on -CURRENT (and I think that I've addressed @bdrewery's comments), are folks ok with me committing this?

sjg edited edge metadata.Oct 6 2016, 1:10 AM

I've no objection.
Bryan had asked for exp-run ?

jonathan added a comment.Oct 6 2016, 1:41 AM

Indeed, I did have that exp-run done:
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210331

The result was "0 new failure, looks fine."

jonathan updated this revision to Diff 21270.Oct 11 2016, 7:34 PM
jonathan edited edge metadata.
  • Merge 'origin/master' into arcpatch-D6805
Closed by commit rS307075: Extract suffix rules into bsd.suffixes[-posix].mk. (authored by jonathan). · Explain WhyOct 12 2016, 12:43 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
share/
mk/
7 lines
56 lines
99 lines
154 lines

Diff 17502

View Options

share/mk/bsd.lib.mk

Loading...
View Options

share/mk/bsd.suffixes-posix.mk

Loading...
View Options

share/mk/bsd.suffixes.mk

Loading...
View Options

share/mk/sys.mk

Loading...