a2d22041b4
Many thanks to Darrin Chandler and dcoppa@ for testing, reporting about
broken stuff, missing dependencies here and in ports depending on ghc.
Notes and rants:
- Bootstrapping is done using precompiled binaries, since .hc
bootstrapping still doesn't work. I really hate this.
THIS MEANS THAT GHC IS NOW AND WILL STAY LEGACY-ONLY (i386 and amd64)
At least until someone fixes it. I tried for more than two year
(well, only in my spare time and during my vacations) and failed.
- libgmp is currently disabled, because I didn't yet hack the GHC build
system to use the system libgmp instead of the patched one included
in GHC.
- The haddock ncluded in the ghc distfile is replaced by the version
of haddock found in devel/haddock. Haddock itself is @commented
in the ghc PLIST. Unfortunately, this needs an ugly hack that
introduces an otherwise useless pseudo flavor `no_deps' in
devel/haddock.
- CLDouble has been removed from GHC some time ago, because it was
an alias for double (AFAIK there's now support for long double
in GHC). As this isn't a really big problem, it currently breaks
c2hs, which I'll mark broken temporarily before committing the
ghc update.
- The external codeset defaults to latin1 (suggested by Simon Marlow)
and can be overridden by setting the HS_ENCODING to any codeset
supported by libiconv.
- ghc.port.mk still needs some love, especially for letting a port add
additional parameters to certain invocations of ${MODGHC_SETUP_PROG}.
33 lines
1.5 KiB
Plaintext
33 lines
1.5 KiB
Plaintext
$OpenBSD: patch-testsuite_driver_testlib_py,v 1.1 2010/04/22 21:49:37 kili Exp $
|
|
--- testsuite/driver/testlib.py.orig Thu Apr 15 15:23:09 2010
|
|
+++ testsuite/driver/testlib.py Fri Apr 16 16:02:57 2010
|
|
@@ -1224,6 +1224,12 @@ def compare_outputs( kind, normaliser, extra_normalise
|
|
actual_raw = read_no_crs(actual_file)
|
|
actual_str = normaliser(actual_raw)
|
|
|
|
+ # Strip OpenBSDs linker warnings about strcpy(3) & friends.
|
|
+ if config.os == 'openbsd':
|
|
+ actual_str = re.sub('.*: In function .*:\n: warning: .* is .* misused, please use .*\n',
|
|
+ '', actual_str)
|
|
+
|
|
+
|
|
if extra_normaliser(expected_str) != extra_normaliser(actual_str):
|
|
print 'Actual ' + kind + ' output differs from expected:'
|
|
|
|
@@ -1238,13 +1244,13 @@ def compare_outputs( kind, normaliser, extra_normalise
|
|
|
|
# Ignore whitespace when diffing. We should only get to this
|
|
# point if there are non-whitespace differences
|
|
- r = os.system( 'diff -uw ' + expected_normalised_file + \
|
|
+ r = os.system( 'diff -auw ' + expected_normalised_file + \
|
|
' ' + actual_normalised_file )
|
|
|
|
# If for some reason there were no non-whitespace differences,
|
|
# then do a full diff
|
|
if r == 0:
|
|
- r = os.system( 'diff -u ' + expected_normalised_file + \
|
|
+ r = os.system( 'diff -au ' + expected_normalised_file + \
|
|
' ' + actual_normalised_file )
|
|
|
|
if config.accept:
|