Page MenuHomeFreeBSD
Differential D18378

Various cleanups for GHC ports.
ClosedPublic
Actions

Authored by arrowd on Nov 29 2018, 11:08 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Nov 25, 4:51 AM
Unknown Object (File)
Sun, Nov 24, 2:50 AM
Unknown Object (File)
Sat, Nov 23, 12:11 PM
Unknown Object (File)
Sat, Nov 23, 6:53 AM
Unknown Object (File)
Fri, Nov 22, 7:25 AM
Unknown Object (File)
Thu, Nov 21, 2:37 AM
Unknown Object (File)
Wed, Nov 20, 6:17 PM
Unknown Object (File)
Wed, Nov 20, 10:01 AM
View All Files
Subscribers
None

Details

Reviewers
tcberner
Commits
rP486824: Cleanup GHC ports:
Summary
  • Switch to using ld instead of binutils ld or ld.bfd on amd64/i386.
  • Add GMP option.
  • Fix create-bootstrap target to produce tarballs ready to be consumed by ports.
  • Update bootstrap compilers to 8.4.3 on amd64/i386.
  • Get rid merge build.boot.mk.in into build.mk.in.
  • Sort some Makefile variables.
Test Plan

poudriere testport -j {rel11, rel11x86, cur13, rel12x86} -I lang/{ghc,ghc843}. For each build enter the jail and compiled simple hello world Haskell program.

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

arrowd created this revision.Nov 29 2018, 11:08 AM
Harbormaster completed remote builds in B21259: Diff 51350.Nov 29 2018, 11:08 AM
arrowd edited the test plan for this revision. (Show Details)Nov 29 2018, 11:27 AM
mikael added a subscriber: mikael.Nov 30 2018, 11:18 AM

Do I need to regenerate the bootstrap for arm?

arrowd added a comment.Nov 30 2018, 3:03 PM
In D18378#391260, @mikael.urankar_gmail.com wrote:

Do I need to regenerate the bootstrap for arm?

Yes, it would be great if you do that. It can now be achieved with just make -C lang/ghc843 build create-bootstrap. Also, set all options (DOCS, DYNAMIC, GMP and PROFILE) to OFF when building bootstraps to save space and build time.

tcberner added a comment.Nov 30 2018, 7:53 PM

Moin moin -- the patch does not apply for me.

arrowd updated this revision to Diff 51456.Dec 1 2018, 6:17 AM

Rebase on recent master.

Harbormaster completed remote builds in B21288: Diff 51456.Dec 1 2018, 6:19 AM
arrowd added a child revision: D18397: lang/ghc862: Create a port..Dec 1 2018, 8:08 AM
arrowd updated this revision to Diff 51465.Dec 1 2018, 11:47 AM
  • Add INTEGER_LIBRARY = %%INTEGER_LIBRARY%% to build.mk template.
Harbormaster completed remote builds in B21292: Diff 51465.Dec 1 2018, 11:50 AM
tcberner accepted this revision.Dec 1 2018, 12:50 PM

Looks good to me now.

This revision is now accepted and ready to land.Dec 1 2018, 12:50 PM
mikael removed a subscriber: mikael.Dec 5 2018, 9:08 AM
mikael added inline comments.
lang/ghc/bsd.ghc.mk
39–42 ↗(On Diff #51465)

This issue is fixed with 8.4.3 on aarch64 and armv6/7

278 ↗(On Diff #51465)

Can we use ${WRKSRC}/ghc-${GHC_VERSION}-${CONFIGURE_TARGET:S/${OSREL}//}.tar.xz instead? I used the llvm triple and not the 'portbld' thing on arm :/

lang/ghc/distinfo
10–11 ↗(On Diff #51465)

http://mikael.urankar.free.fr/FreeBSD/aarch64/ghc-8.4.3-boot-aarch64-freebsd.tar.xz
SHA256 (ghc-8.4.3-boot-aarch64-freebsd.tar.xz) = 84611f37d31a43a3216274ee7dcee4b89f2c5ef6ab713222f266b5658c736e05
SIZE (ghc-8.4.3-boot-aarch64-freebsd.tar.xz) = 99933576

arrowd marked an inline comment as done.Dec 5 2018, 6:41 PM
arrowd added inline comments.
lang/ghc/bsd.ghc.mk
278 ↗(On Diff #51465)

I used the llvm triple

What does that mean? You didn't use the port to build the bootstrap?

arrowd updated this revision to Diff 51626.Dec 5 2018, 8:00 PM
  • Use 8.4.3 bootstrap for aarch64.
  • Move ONLY_FOR_ARCHS to bsd.ghc.mk.
This revision now requires review to proceed.Dec 5 2018, 8:00 PM
Harbormaster completed remote builds in B21377: Diff 51626.Dec 5 2018, 8:00 PM
arrowd updated this revision to Diff 51627.Dec 5 2018, 8:02 PM
  • Enable DYNAMIC option on arm arches.
Harbormaster completed remote builds in B21378: Diff 51627.Dec 5 2018, 8:04 PM
arrowd updated this revision to Diff 51670.Dec 6 2018, 5:53 PM
  • Use 8.4.2 bootstrap on armv{6,7}.
Harbormaster completed remote builds in B21403: Diff 51670.Dec 6 2018, 5:53 PM
tcberner accepted this revision.Dec 6 2018, 7:52 PM

Still looks good to me.

This revision is now accepted and ready to land.Dec 6 2018, 7:52 PM
Closed by commit rP486824: Cleanup GHC ports: (authored by arrowd). · Explain WhyDec 7 2018, 5:49 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
head/
lang/
ghc/
2 lines
76 lines
14 lines
files/
9 lines
1 line
ghc843/
2 lines
14 lines
files/
9 lines
1 line

Diff 51700

View Options

head/lang/ghc/Makefile

Loading...
View Options

head/lang/ghc/bsd.ghc.mk

Loading...
View Options

head/lang/ghc/distinfo

Loading...
View Options

head/lang/ghc/files/build.boot.mk.in

Loading...
View Options

head/lang/ghc/files/build.mk.in

Loading...
View Options

head/lang/ghc843/Makefile

Loading...
View Options

head/lang/ghc843/distinfo

Loading...
View Options

head/lang/ghc843/files/build.boot.mk.in

Loading...
View Options

head/lang/ghc843/files/build.mk.in

Loading...