Page MenuHomeFreeBSD
Differential D34249

Makefile.inc1: add fallback to set PKG_ABI from newvers.sh
ClosedPublic
Actions

Authored by emaste on Feb 11 2022, 2:31 PM.
Tags
None
Referenced Files
F109801651: D34249.diff
Sun, Feb 9, 5:38 PM
Unknown Object (File)
Tue, Feb 4, 7:00 AM
Unknown Object (File)
Tue, Feb 4, 6:47 AM
Unknown Object (File)
Sun, Jan 26, 12:23 PM
Unknown Object (File)
Thu, Jan 16, 9:28 AM
Unknown Object (File)
Wed, Jan 15, 8:50 AM
Unknown Object (File)
Sat, Jan 11, 7:02 PM
Unknown Object (File)
Sat, Jan 11, 12:03 AM
View All 60 Files
Subscribers
imp

Details

Reviewers
manu
kevans
Commits
rGea9a92d21007: Makefile.inc1: synthesize PKG_ABI from newvers.sh variables
Summary

If ${WSTAGEDIR}/usr/bin/uname does not exist (e.g., if building only kernel packages) we were unable to determine PKG_ABI. In this case synthesize it from newvers.sh.

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

emaste requested review of this revision.Feb 11 2022, 2:31 PM
emaste created this revision.
emaste added a reviewer: kevans.
manu accepted this revision.Feb 11 2022, 2:34 PM

LGTM

This revision is now accepted and ready to land.Feb 11 2022, 2:34 PM
emaste updated this revision to Diff 102661.Feb 11 2022, 2:52 PM

always use newvers.sh mode

This revision now requires review to proceed.Feb 11 2022, 2:52 PM
manu accepted this revision.Feb 11 2022, 2:54 PM
This revision is now accepted and ready to land.Feb 11 2022, 2:54 PM
kevans accepted this revision.Feb 11 2022, 3:48 PM
Closed by commit rGea9a92d21007: Makefile.inc1: synthesize PKG_ABI from newvers.sh variables (authored by emaste). · Explain WhyFeb 11 2022, 5:01 PM
This revision was automatically updated to reflect the committed changes.
emaste added a commit: rGea9a92d21007: Makefile.inc1: synthesize PKG_ABI from newvers.sh variables.
Herald added a subscriber: imp. · View Herald TranscriptFeb 11 2022, 5:01 PM
imp added inline comments.Feb 11 2022, 5:28 PM
Makefile.inc1
526

This shouldn't do this. It should do eval $(newvers.sh -V ${_V}) instead. These aren't guaranteed to be constants.
A note for another day...

emaste mentioned this in D34253: newvers.sh: allow multiple -V args in one invocation.Feb 11 2022, 5:58 PM
emaste added inline comments.
Makefile.inc1
526

Indeed. I submitted D34253 as one tiny step related to this

1885

We could perhaps drop the uname case and always use newvers.sh

1885

Oops this was an unsubmitted draft comment. I discussed on IRC and updated to include this.

Revision Contents
Changeset List

PathSize
8 lines

Diff 102661

View Options

Makefile.inc1

Loading...