Commit Graph

249 Commits

Author SHA1 Message Date
gnezdo b6225432eb Add xonly workaround in lang/ghc
Some kind of info tables are embedded into text making the build
process fail in freshly built ghc-cabal. The generated code reads from
ZCMain_main_info.

OK tb, kili
2023-01-20 04:45:48 +00:00
gnezdo f8aa867fbf Upgrade lang/ghc 9.2.4->9.2.5
OK kili@
2022-12-10 23:20:13 +00:00
sthen 533f76026d regen PLISTs following py-sphinx update 2022-10-31 08:47:46 +00:00
kili 6fab5af730 Switch to bootstrap distfiles that contain current shared libs.
This still uses ghc-8.10.7 for bootstrapping (ghc-9.4 can't be used
for bootstrapping, because the make dependencies are broken).
2022-09-04 20:50:36 +00:00
sthen 9be5d24900 allow the "cp /usr/lib/libc.so.96.1 ${WRKDIR}/ghc-*-shlibs-*/" to fail 2022-09-03 19:43:17 +00:00
kili 44f9ae568f Fix build by adding part of another upstream commit. 2022-09-02 18:31:16 +00:00
gnezdo ce0ec29752 Pickup an upstream patch for booting with ghc 9.2
kili@: can't get worse
2022-08-31 12:02:53 +00:00
gnezdo 58db17fa94 Repair ghc bootstrap which broke for ghc-9.2
The ffi header files should be excluded.

Moved the bootstrap.mk into a file instead of echoing into it
repeatedly.

kili@: can't get worse
2022-08-31 12:02:29 +00:00
gnezdo 3b437d5175 Remove some outdated workaround in lang/ghc
They made sense in the past but upstream fixed the related issues.

OK kili@
2022-08-30 15:38:50 +00:00
gnezdo af653c21f2 Upgrade lang/ghc 9.2.{3->4}
OK kili@
2022-07-31 19:27:03 +00:00
sthen 0b20c3f0ea temporary repair for lang/ghc binary bootstraps (copy in libc.so.96.1 from
base after extracting; syscalls were changed such that the old copy of
libc.so.96.1 is no longer usable)
2022-07-20 15:33:17 +00:00
sthen 8311c389e4 regen PLIST following sphinx update 2022-07-07 16:23:17 +00:00
gnezdo 9e904e57c5 Upgrade lang/ghc 9.2.2->9.2.3
Mostly mechanical, except for having to run ./boot per
https://gitlab.haskell.org/ghc/ghc/-/issues/21626

Removed the %n patches merged into the release. The ./configure patch
is no longer needed and wouldn't apply due to #21626 above.

OK kili@
2022-06-03 02:48:37 +00:00
gnezdo 18684b9d06 Remove USE_WXNEEDED from lang/ghc as it's no longer needed
Verified by rebuilding on a filesystem without wxneeded and running
ghci from /usr/local with wxneeded turned off.

OK kili@
2022-06-03 02:48:07 +00:00
gnezdo 38156bbbcb Remove a forgotten lang/ghc patch for no longer supported i386
OK kili@
2022-05-19 02:10:15 +00:00
gnezdo a61caa7eaf Remove i386 support from ghc-9.2.2
Our recipe for rebuilding bootstrap binaries produces binaries prone
to SEGV. The platform has limited memory and was already failing to
build haddocks for ghc.

Consolidated PLIST back into a single file.

ok kili@
2022-04-30 02:38:16 +00:00
gnezdo b3c883b7f7 Upgrade lang/ghc to 9.2.2
ok kili@
2022-04-30 02:37:59 +00:00
naddy e93f9d0ca9 drop RCS Ids 2022-03-11 19:28:46 +00:00
gnezdo 8d9ad833c1 Remove irrelevant lang/ghc patch
kili: fine to remove
2021-11-09 04:48:50 +00:00
kili d77c07d6bd Kill a %n format specifier used in report_summary().
Reminder to also handle the vdebugBelch() case by gnezdo@
2021-09-14 17:53:11 +00:00
gnezdo 4ca4ee0f79 Update lang/ghc to 8.10.6
A couple of patches are obsolete now.

OK kili
2021-08-16 21:23:18 +00:00
daniel 7437f9d093 update py-sphinx to 4.0.2 and regen PLISTs for affected consumers
all consumers were packaged and installed on amd64 by me; all python2
syntax in consumers appears to have been updated at this point making
it possible to move to the 4.x series.

lang/ghc bits look ok to gnezdo@

ok sthen@ on the rest
2021-07-06 16:55:32 +00:00
gnezdo dd66bc059c Update lang/ghc to 8.10.5
The change in cabal-install has to be synchronized due to some
internal version numbers embedded into the JSON file.

ok kili@
2021-06-09 04:22:19 +00:00
gnezdo ccd474f637 Bootstrap lang/ghc with GHC 8.10.3
ok kili@
2021-05-02 21:45:24 +00:00
kili e1354898f7 New bootstrappers:
SHA256 (ghc-8.10.3.20210429-amd64-unknown-openbsd.tar.xz) = GR5pHBh8PWUn12UK+XZ6ikB2+xWxkdqAsYaEBsiR0Zo=
SHA256 (ghc-8.10.3.20210429-i386-unknown-openbsd.tar.xz) = T1OMZYN2sr+E88g88qElX6RYZbPdqANXGhWgCfKdFiY=
SHA256 (ghc-8.10.3.20210429-shlibs-amd64.tar.gz) = M+B6p7cC4v3f1BrArX1DW6sie+HX3itEW5cTftI9yZE=
SHA256 (ghc-8.10.3.20210429-shlibs-i386.tar.gz) = A/paDCY65gLRxas7/mNGUg0W7lR9XWJcJmnAJkcf5C4=
2021-04-29 16:57:48 +00:00
gnezdo 703e5fc2f0 Revive ONLY_FOR_ARCHS in lang/ghc
It was lost in ghc.port.mk removal, pointed out by tb@

ok kili
2021-03-17 01:39:22 +00:00
gnezdo 04a2a55e6e Upgrade lang/ghc to 8.10.3
Some non-trivial adaptations:
 * Remove  -Wl,-z,notext from compiler flags
 * Backport from ghc HEAD: move debugBelch into IF_DEBUG(linker)
 * Move debugBelch into IF_DEBUG(linker) [fixup 3433]
 * Undo ghci slowness [fixup 18727]
 * Increase open FD limit for test runs to 1024
 * Disable haddock on i386 using PFRAG

ok kili
2021-03-10 01:33:40 +00:00
gnezdo 68394865a5 Remove ghc.port.mk (copy the relevant parts into ghc/Makefile)
OK kili
2021-03-07 19:29:41 +00:00
sthen 3cbe1c2f30 Reverse the polarity of MODPY_VERSION; default is now 3.x,
if a port needs 2.x then set MODPY_VERSION=${MODPY_DEFAULT_VERSION_2}.

This commit doesn't change any versions currently used; it may be that
some ports have MODPY_DEFAULT_VERSION_2 but don't require it, those
should be cleaned up in the course of updating ports where possible.

Python module ports providing py3-* packages should still use
FLAVOR=python3 so that we don't have a mixture of dependencies some
using ${MODPY_FLAVOR} and others not.
2021-02-23 19:39:08 +00:00
sthen 29704c3c83 adapt to py-sphinx-3.5.1 2021-02-20 22:27:27 +00:00
sthen 24dc82a9f9 ghc: regen plist; sphinx update 2020-12-10 21:41:39 +00:00
daniel ceb3a6300c update py-sphinx to 1.5.6
main changes are:
- add a new dep on py-requests
- undo the no longer needed iftex.sty workaround
- move MODPY variables to more standard location
- regen plist

Unfortunately py-sphinx changed the suffix from .txt to .rst.txt in the
1.5 series. This means we have to update PLISTs for about 20+ ports as
a result of this version update. Hopefully future updates of py-sphinx
won't be quite as involved.

ok sthen@
2020-12-10 02:20:29 +00:00
kili 64924804cb Build a threaded bootstrapper (from gnezdo@).
This will be required to build ghc-8.10, but we also enable it for
ghc-8.6 to be sure it works.
2020-09-22 22:23:05 +00:00
gnezdo b2b378ba2c lang/ghc workaround for clang 10 fallout
Adapted from https://gitlab.haskell.org/ghc/ghc/-/issues/17962
2020-08-01 14:52:44 +00:00
kili 9b530bf287 Switch to using autoconf and patching aclocal.m4 and configure.ac.
This allows for cleaning up the Makefile and for at least a chance
to get things like -z notext and -z wxneeded merged upstream for
amd64 *and* i386.

It also removes a -fno-pie hidden in patches/patch-configure.

Looks good to Greg, who also tested it by building xmonad and all
of its dependencies using cabal (in addition to my ordinary build
tests).
2020-05-31 19:25:48 +00:00
kili 8a30a11788 On i386, explicitely set GHC_CC_OPTS to -Wl,-znotext -Wl,-z,wxneeded.
Also, drop -fno-pie from CFLAGS.

Unbreaks build as noticed by sthen and also fixes ghci.
2020-05-17 18:06:07 +00:00
kili 74ad251f86 Some ghc cleanups:
- Remove -no-pie from GHC_CC_OPTS.
- Remove obsolete ffi related patch.
- Remove explicit wxneeded from Makefile.

From Greg Steuck. Thanks!
2020-05-15 21:32:18 +00:00
kn 1dc859d591 Use py3 sphinx during build and @so markers in PLIST
ghc already defaults to Python 3, make sure sphinx uses the
same version.

tested by me without Python 2 installed
diff from gznedo
2020-04-30 23:16:59 +00:00
kili 7a3901f2eb Remove unneeded patch-libffi_ghc_mk.
From Greg Steuck.
2020-03-19 21:32:58 +00:00
kili 3ed0b4519c Remove the old HS_ENCODING hack.
From Greg Steuck. Thanks!
2020-02-09 19:15:25 +00:00
kili 49df02bee8 We'll need ghc-8.6 bootstrappers for ghc-8.8.
If things go well, I'll try to jump to 8.10 (build 8.8 without
committing, build new bootstrappers from that, and then work on
8.10).

While here, make it possible to build the bootstrappers with
PORTS_PRIVSEP enabled (dirty and brittle, but works for me[tm]).
2020-01-03 21:55:57 +00:00
kili ee425ea19d Enforce nojunk for hs ports, because ghc-pkg has some race condition.
prodded by espie@
2019-12-02 23:32:29 +00:00
kili 1f3c8fa44b Adjust comment. libiserv actually has a version number different from ghc. 2019-10-21 20:36:15 +00:00
kili f83229fe78 Enable the build of lang/ghc again. 2019-09-30 13:15:39 +00:00
kili 770fd1c403 Update to ghc-8.6.4.
Joint work with Greg Steuck.

Marked as BROKEN until all the following churn on hs-ports is in.
2019-09-30 11:44:18 +00:00
kili e80c5def54 fixup-hs-plist is no longer needed. 2019-09-10 20:55:26 +00:00
kili 42ec039af8 Switch ghc and hs-ports from @exec/@unexec to @define-tag/@tag.
ghc and the hs-packages now simply include the necessary (haskell)
package description files in lib/ghc/package.conf.d and update the
package.cache by running ghc-pkg recache at the end. register and
unregister scripts are no longer needed.
2019-09-10 13:51:21 +00:00
sthen 3318ced016 replace simple PERMIT_PACKAGE_CDROM=Yes with PERMIT_PACKAGE=Yes 2019-07-12 20:46:54 +00:00
sthen b17bf3228e update curses WANTLIB entries following the change in base libraries to use soname 2019-05-17 16:19:37 +00:00
sthen d7f0752227 bump all the py3 things, _SYSTEM_VERSION didn't quite work out how
we expected and it's easier|safer to do it this way than fiddle with
pkg_add now. thanks aja for update tests with a quick bulk.
2019-04-28 20:51:26 +00:00