Use a unified packing list for base/binutils.
ClosedPublic
Actions

Authored by jhb on Jun 14 2018, 7:26 PM.

Details

Reviewers

bapt
bdrewery

Commits

rP473568: Use a unified packing list for base/binutils.

Summary

Create a single pkg-plist that uses arch-specific PLIST_SUBs to control
arch-specific linker scripts but is otherwise machine-independent.

Only include objcopy for OS versions older than 11.0 (11.0 uses the elftoolchain elfcopy as objcopy in the base system)
Use %%BUTARGET%% throughout. This probably fixes the sparc64 pkg-plist which was not updated when BUTARGET started including OSREL. This also avoids hardcoding an OSREL of 12.0 for powerpc64.
Enable MIPS ldscripts for all MIPS architectures which probably fixes this port on mips64 and mipsn32.
Enable PowerPC ldscripts for all PowerPC architectures which probably fixes this port on powerpc.

Test Plan

built and used freebsd-binutils for FreeBSD/mips

Diff Detail

Repository

rP FreeBSD ports repository

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 17284
Build 17121: arc lint + arc unit

Event Timeline

jhb created this revision.Jun 14 2018, 7:26 PM

Herald added a subscriber: mat. · View Herald TranscriptJun 14 2018, 7:26 PM

Harbormaster completed remote builds in B17283: Diff 43782.Jun 14 2018, 7:26 PM

jhb mentioned this in D15542: Drop objcopy from base/binutils for sparc64 and powerpc64..Jun 14 2018, 7:27 PM

jhb added a parent revision: D15812: Set OS versions to target system versions for CROSS_SYSROOT..

I'm not sure why phab failed to upload the contents of pkg-plist.

Try to update to see if pkg-plist is fixed.

Harbormaster completed remote builds in B17284: Diff 43783.Jun 14 2018, 7:31 PM

Sigh, silly arc. Anyway, if I could use a single glob line of '%%BUTARGET%%/lib/ldscripts/*' in the pkg-plist file that would make the plist a lot simpler and would remove the need for any arch-specific logic in the plist.

(You can find the current pkg-plist file that arcanist refuses to upload in /zoo/jhb/ports/base/binutils/pkg-plist on zoo.freebsd.org)

Ping. Also curious if you (or anyone else) has thoughts about being able to use 'ldscripts/*' in pkg-plist. It would make this plist a lot simpler and simplify porting this package to other platforms (I think it would then just work on all of our supported platforms). There is similar mischief for GCC's include directory which includes different headers based on the target architecture (the include/ dir for intrinsic headers like xmmintrin.h etc.)

Can you link your patch from freefall so I can see the plist contents?

Looks fine / approved. I'm not a maintainer of this port though.
As for 'ldscripts/*' I support that (autoplist style) but in general no other portmgr does (and bapt certainly does not) since it does not fail if an expected file is missing.

This revision is now accepted and ready to land.Jun 25 2018, 11:54 PM

bapt accepted this revision.Jun 29 2018, 6:02 PM

jhb closed this revision.Jun 29 2018, 6:11 PM

jhb added a commit: rP473568: Use a unified packing list for base/binutils..