Page MenuHomeFreeBSD

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

Authored by jonathan on Jun 11 2016, 1:28 AM.
Tags
None
Referenced Files
F102635046: D6805.id17650.diff
Fri, Nov 15, 3:20 AM
Unknown Object (File)
Tue, Nov 5, 7:28 AM
Unknown Object (File)
Mon, Nov 4, 5:03 AM
Unknown Object (File)
Mon, Nov 4, 5:02 AM
Unknown Object (File)
Sat, Nov 2, 9:26 AM
Unknown Object (File)
Fri, Nov 1, 3:29 PM
Unknown Object (File)
Sat, Oct 26, 2:00 PM
Unknown Object (File)
Fri, Oct 18, 5:07 AM
Subscribers

Details

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 Not Applicable
Unit
Tests Not Applicable

Event Timeline

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.
share/mk/bsd.lib.mk
93 ↗(On Diff #17502)

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

share/mk/bsd.lib.mk
93 ↗(On Diff #17502)

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 edited edge metadata.

Please also get a ports exp-run before committing this

share/mk/sys.mk
261 ↗(On Diff #17502)

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

266 ↗(On Diff #17502)

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 edited edge metadata.
  • Add bsd.suffixes[-posix].mk to share/mk/Makefile.

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

jonathan edited edge metadata.
  • Move .SUFFIXES definitions into suffix rule files, too.
  • 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.

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?

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

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 edited edge metadata.
  • Merge 'origin/master' into arcpatch-D6805
This revision was automatically updated to reflect the committed changes.