Page MenuHomeFreeBSD
Differential D17866

lang/ghc: Update to 8.4.4 and copy current version to lang/ghc843.
ClosedPublic
Actions

Authored by arrowd on Nov 6 2018, 11:28 AM.
Tags
None
Referenced Files
F115249999: D17866.id50311.diff
Mon, Apr 21, 9:09 PM
Unknown Object (File)
Mon, Apr 21, 2:53 PM
Unknown Object (File)
Sun, Apr 6, 3:24 PM
Unknown Object (File)
Fri, Apr 4, 8:33 AM
Unknown Object (File)
Sun, Mar 30, 9:17 AM
Unknown Object (File)
Feb 27 2025, 7:25 AM
Unknown Object (File)
Feb 26 2025, 9:31 AM
Unknown Object (File)
Feb 26 2025, 5:49 AM
View All Files
Subscribers
None

Details

Reviewers
tcberner
mikael
Commits
rP485232: lang/ghc843: Add a port for 8.4.3 version.
rP485229: lang/ghc: Update to 8.4.4 and factor out common port code into bsd.ghc.mk in…
Summary

I decided to keep older versions of GHC ports in tree to easen producing binary distributions for Haskell Stack.
These ports are not intended to be used instead of lang/ghc port to build hs-* ports, so no fiddling with DEFAULT_VERSIONS is done.

Change log:

  • Add "amd64-portbld-freebsd" LLVM target.
  • Refresh patch for OSMem.c.

-Remove now obsolete hunk from patch-configure.ac.

-Pop "CONFIGURE_ENV+=OPT=opt50 LLC=llc50" out of ARM .if clause.

-Refresh patch-llvm-targets patch.

-Set "opt" and "llc" executables via settings file.

  • Create lang/ghc843 port from lang/ghc one.

-Factor out common GHC port code into bsd.ghc.mk.

  • Share pkg-plist between lang/ghc and lang/ghc843.

-lang/ghc: Add patch to fix build on ARM arches.

Test Plan

Done poud bulk */hs-* devel/stack textproc/cgrep on 12.0-BETA3 i386/amd64 and 11.2-RELEASE i386/amd64.
ARM testing done by Mikael Urankar <mikael.urankar@gmail.com>

Diff Detail

Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 20764
Build 20165: arc lint + arc unit

Event Timeline

arrowd created this revision.Nov 6 2018, 11:28 AM
Harbormaster completed remote builds in B20656: Diff 50066.Nov 6 2018, 11:28 AM
tcberner added a comment.Nov 9 2018, 11:24 PM

Make sure you have create the new ports via svn cp, so that it has the history.

lang/ghc/bsd.ghc.mk
6

^ new "created by" should not be added, unless you *really* want it :D

arrowd updated this revision to Diff 50311.Nov 12 2018, 11:02 AM
  • Remove "Created by" comment.
Harbormaster completed remote builds in B20764: Diff 50311.Nov 12 2018, 11:02 AM
arrowd marked an inline comment as done.Nov 12 2018, 11:02 AM
tcberner accepted this revision.Nov 18 2018, 1:11 PM

Looks good to me.

Make sure you do an svn cp of lang/ghc to lang/ghc843!

This revision is now accepted and ready to land.Nov 18 2018, 1:11 PM
Closed by commit rP485229: lang/ghc: Update to 8.4.4 and factor out common port code into bsd.ghc.mk in… (authored by arrowd). · Explain WhyNov 18 2018, 3:31 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 50311

View Options

lang/Makefile

Show First 20 Lines • Show All 1,950 Lines • ▼ Show 20 Lines
{ {
LIST_HEAD(, rctl_rule_link) newrules; LIST_HEAD(, rctl_rule_link) newrules;
struct rctl_rule_link *link, *newlink; struct rctl_rule_link *link, *newlink;
struct uidinfo *newuip; struct uidinfo *newuip;
struct loginclass *newlc; struct loginclass *newlc;
struct prison_racct *newprr; struct prison_racct *newprr;
int rulecnt, i; int rulecnt, i;
ASSERT_RACCT_ENABLED(); if (!racct_enable)
return;
PROC_LOCK_ASSERT(p, MA_NOTOWNED);
newuip = newcred->cr_ruidinfo; newuip = newcred->cr_ruidinfo;
newlc = newcred->cr_loginclass; newlc = newcred->cr_loginclass;
newprr = newcred->cr_prison->pr_prison_racct; newprr = newcred->cr_prison->pr_prison_racct;
LIST_INIT(&newrules); LIST_INIT(&newrules);
again: again:
/* /*
* First, count the rules that apply to the process with new * First, count the rules that apply to the process with new
* credentials. * credentials.
*/ */
rulecnt = 0; rulecnt = 0;
▲ Show 20 Lines • Show All 263 Lines • Show Last 20 Lines
View Options

lang/ghc/Makefile

Show First 20 Lines • Show All 1,950 Lines • ▼ Show 20 Lines
{ {
LIST_HEAD(, rctl_rule_link) newrules; LIST_HEAD(, rctl_rule_link) newrules;
struct rctl_rule_link *link, *newlink; struct rctl_rule_link *link, *newlink;
struct uidinfo *newuip; struct uidinfo *newuip;
struct loginclass *newlc; struct loginclass *newlc;
struct prison_racct *newprr; struct prison_racct *newprr;
int rulecnt, i; int rulecnt, i;
ASSERT_RACCT_ENABLED(); if (!racct_enable)
return;
PROC_LOCK_ASSERT(p, MA_NOTOWNED);
newuip = newcred->cr_ruidinfo; newuip = newcred->cr_ruidinfo;
newlc = newcred->cr_loginclass; newlc = newcred->cr_loginclass;
newprr = newcred->cr_prison->pr_prison_racct; newprr = newcred->cr_prison->pr_prison_racct;
LIST_INIT(&newrules); LIST_INIT(&newrules);
again: again:
/* /*
* First, count the rules that apply to the process with new * First, count the rules that apply to the process with new
* credentials. * credentials.
*/ */
rulecnt = 0; rulecnt = 0;
▲ Show 20 Lines • Show All 263 Lines • Show Last 20 Lines
View Options

lang/ghc/bsd.cabal.options.mk

Show First 20 Lines • Show All 1,950 Lines • ▼ Show 20 Lines
{ {
LIST_HEAD(, rctl_rule_link) newrules; LIST_HEAD(, rctl_rule_link) newrules;
struct rctl_rule_link *link, *newlink; struct rctl_rule_link *link, *newlink;
struct uidinfo *newuip; struct uidinfo *newuip;
struct loginclass *newlc; struct loginclass *newlc;
struct prison_racct *newprr; struct prison_racct *newprr;
int rulecnt, i; int rulecnt, i;
ASSERT_RACCT_ENABLED(); if (!racct_enable)
return;
PROC_LOCK_ASSERT(p, MA_NOTOWNED);
newuip = newcred->cr_ruidinfo; newuip = newcred->cr_ruidinfo;
newlc = newcred->cr_loginclass; newlc = newcred->cr_loginclass;
newprr = newcred->cr_prison->pr_prison_racct; newprr = newcred->cr_prison->pr_prison_racct;
LIST_INIT(&newrules); LIST_INIT(&newrules);
again: again:
/* /*
* First, count the rules that apply to the process with new * First, count the rules that apply to the process with new
* credentials. * credentials.
*/ */
rulecnt = 0; rulecnt = 0;
▲ Show 20 Lines • Show All 263 Lines • Show Last 20 Lines
View Options

lang/ghc/bsd.ghc.mk

Show First 20 Lines • Show All 1,950 Lines • ▼ Show 20 Lines
{ {
LIST_HEAD(, rctl_rule_link) newrules; LIST_HEAD(, rctl_rule_link) newrules;
struct rctl_rule_link *link, *newlink; struct rctl_rule_link *link, *newlink;
struct uidinfo *newuip; struct uidinfo *newuip;
struct loginclass *newlc; struct loginclass *newlc;
struct prison_racct *newprr; struct prison_racct *newprr;
int rulecnt, i; int rulecnt, i;
ASSERT_RACCT_ENABLED(); if (!racct_enable)
return;
PROC_LOCK_ASSERT(p, MA_NOTOWNED);
newuip = newcred->cr_ruidinfo; newuip = newcred->cr_ruidinfo;
newlc = newcred->cr_loginclass; newlc = newcred->cr_loginclass;
newprr = newcred->cr_prison->pr_prison_racct; newprr = newcred->cr_prison->pr_prison_racct;
LIST_INIT(&newrules); LIST_INIT(&newrules);
again: again:
/* /*
* First, count the rules that apply to the process with new * First, count the rules that apply to the process with new
* credentials. * credentials.
*/ */
rulecnt = 0; rulecnt = 0;
▲ Show 20 Lines • Show All 263 Lines • Show Last 20 Lines
View Options

lang/ghc/distinfo

Loading...
View Options

lang/ghc/files/patch-configure.ac

Loading...
View Options

lang/ghc/files/patch-fix-build-on-arm

Loading...
View Options

lang/ghc/files/patch-llvm-targets

Loading...
View Options

lang/ghc/files/patch-rts_posix_OSMem.c

Loading...
View Options

lang/ghc843/Makefile

Loading...
View Options

lang/ghc843/distinfo

Loading...
View Options

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

Loading...
View Options

lang/ghc843/files/build.mk.in

Loading...
View Options

lang/ghc843/files/extra-patch-aclocal.m4

Loading...
View Options

lang/ghc843/files/patch-configure

Loading...
View Options

lang/ghc843/files/patch-configure.ac

Loading...
View Options

lang/ghc843/files/patch-ghc.mk

Loading...
View Options

lang/ghc843/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs

Loading...
View Options

lang/ghc843/files/patch-llvm-targets

Loading...
View Options

lang/ghc843/files/wrap.c

Loading...
View Options

lang/ghc843/pkg-descr

Loading...