219 Commits

Author SHA1 Message Date
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
naddy
d8e6d28ec4 -fno-pie produces text relocations on i386 and must be combined with
-Wl,-znotext for lld
2018-11-14 15:08:49 +00:00
kili
a165c46b86 Enable the new bootstrapper.
To my surprise, it just works, and there are no hs library signature
changes, so there's no need to touch all the hs-* ports.

Next steps will be (in no particular order): enable PIE, update to
ghc 8.4, kill W^X, debug and fix the SIG(SEGV|TRAP|BUS|ILL) problems
with tehmplate haskell seen by some people.
2018-03-30 23:16:59 +00:00
kili
2c6e03fe34 Prepare a new bootstrapper. 2018-03-30 18:18:27 +00:00
kili
b7d980d5d4 The magic in testsuite/mk/test.mk for detecting which library ways
are available fails badly if the ghc-prim package contains more
than one entry in the library-dirs: field, which is currently the
case for our ghc port.

Only check for the existance of vertain files in the first entry
of the library-dirs: field to re-enable tons of previously disabled
tests and to get rid of stupid "/bin/sh: [: ... unexpected
operator/operand" errors.

This should be fixed for real at both our side (don't include the
same directory twice in the library-dirs: field) and upstream (don't
rely on the library-dirs: field only containing one directory).
2018-02-13 21:17:51 +00:00
kili
0b4689a8c1 Drop the horrible SHN_XINDEX hack. 2018-02-09 10:09:44 +00:00
kili
a702a6aeba Fix the patch for test 3677 -- those tests are now all prefixed
with 'T', and I've no idea how I managed to merge it without
the 'T'.
2018-01-28 19:40:29 +00:00
kili
b28d685d2b Remove a testsuite patch used for our pkgpath diff, which had been
lost some time ago.
2018-01-28 19:37:31 +00:00
kili
f9a3c58177 Use python3 for the test suite, and drop run and build dependencies
on python.
2018-01-27 23:49:33 +00:00
kili
dc40fa773b Enable the build of lang/ghc again. 2018-01-23 20:59:49 +00:00
kili
e30b58ad21 Update to ghc-8.2.2,
but mark it as broken for a few days.
2018-01-22 00:42:30 +00:00
kili
f19b2e4f6d Prepare new bootstrapper based on ghc-8.0.1 for use with ghc-8.0.2
or ghc-8.2.x (yet untested).

Also, don't build iserv with -threading if multithreading is disabled
(which is the case for the bootstrappers we build). I could also have
patched out iserv from the bindist targets, but this way it's simpler.
2017-12-05 20:21:19 +00:00
kili
461f073c76 Re-enable lang/ghc.
package builders: feel free to mark it as broken again if
it triggers too much fallout.
2017-11-08 22:00:59 +00:00
kili
89e850c4b4 Update to ghc-8.0.1, but leave it marked as BROKEN for now. 2017-11-07 02:58:34 +00:00
kili
c4bddc97a3 Mark as broken until everything is done. 2017-11-06 19:15:05 +00:00
sthen
3f1f5bba3e Set USE_WXNEEDED=special; don't use the wrapper script, but do record
USE_WXNEEDED in sqlports.
2017-06-05 20:20:49 +00:00
kili
cc8f62b3a2 Still too much noise for espie@, so add -Wno-expansion-to-defined. 2017-05-01 19:31:08 +00:00
kili
e177836f24 Suppress a lot of (not all) warnings when using clang:
ghc uses cc for generating object files from assembler files and
passes the CONF_CC_OPTS_STAGE? flags to it, which clang doesn't
like, so add -Wno-unused-command-line-argument to the flags passed
to cc if it's clang.

To let this work for the bootstrap compiler, properly CONFIGURE_ENV
when installing the bootstrap (in post-patch:). This also makes the
hack patching the bootstrap/bin/ghc script in post-patch: obsolete.

prodded by (and with some hints from) espie@

~here are still a lot of warnings, most about macros #defined in
storage/ClosureMacros.h. Those should be fixed in a separate step,
probably after an update to ghc-8.
2017-04-30 21:33:26 +00:00
kili
3ee734d752 Use the new boostrappers with the better clang detection fix from espie@.
No objectsion, espie@

(But it still produces tons of warnings, even when compiling ordinary
.hs files)
2017-04-18 18:38:11 +00:00
espie
da7d639c16 give the system a chance to figure out clang (their detection method is lame
as the patch shows).

you'll need to wait for a bootstrap/rebootrap yourself so this is actually
effective.

(should cut down *a lot* on the insane number of warnings produced due to
unknown compile options on a clang system)

okay kili@
2017-04-17 17:21:49 +00:00
kili
a8aae2853f Add quotes. Just in case someoen sets CC="my beloved C compiler". 2017-03-02 23:23:28 +00:00
kili
5fce04f350 Workaround: add --with-gcc=${CC} to hs-ports using cabal.
This should be fixed for real in libraries/Cabal (in the ghc
source tree), but I'm not going to do this for ghc-7.10.3.
2017-03-02 22:44:06 +00:00
kili
497f1b34b6 Try to work with just /usr/bin/cc (instead of /usr/bin/gcc). 2017-02-28 00:07:10 +00:00
kili
26023d3f4a Instead of setting USE_WXNEEDED=Yes, explicitely pass -Wl,-z,wxneeded
the linker again. Otherwise, the ld wrapper script installed when
USE_WXNEEDED=Yes will be used by the installed ghc package.

Problem noticed by Karel Gardas.
2016-11-01 18:14:05 +00:00
naddy
bac38152ca replace libiconv module 2016-09-13 18:52:05 +00:00
kili
beb055d0d0 Switch to USE_WXNEEDED. 2016-08-20 19:39:37 +00:00
kili
f8557828d9 Remove unused CONF_GCC_LD_OPTS_STAGE* from CONFIGURE_ENV. 2016-08-13 18:54:58 +00:00
kili
7977309d52 Mark ghc as wxneeded for now.
A real fix would be to remove PROT_EXEC from mmapForLinker() in
rts/Linker.c and to flip PROT_WRITE / PROT_EXEC  in loadObj_()
when it's done, but this requires a little bit more time for
testing (turnaround times for building and testing ghc aren't
that funny).
2016-08-10 07:08:28 +00:00
kili
7781d0abf0 Provide and use additional distfiles containing the shared libraries
required by the bootstrapper, so we don't need a new bootstrapper
whenever libc or other required libraries gets a major bump.

requested by naddy@
2016-04-05 08:15:50 +00:00
kili
fb40da4e25 New bootstrappers, this time for real linked against new libc and libpthread.
Fix a typo in a comment (noticed by naddy@).
2016-03-25 10:42:17 +00:00
kili
4b2e6e59b5 New bootstrappers. 2016-03-24 20:32:57 +00:00