[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.12.3-1.dsc
Kari Pahula
kaol at debian.org
Sat Jan 15 06:07:49 UTC 2011
Tue Jul 20 16:19:20 UTC 2010 Kari Pahula <kaol at debian.org>
* Import of ghc6_6.12.3-1.dsc
M ./changelog +21
M ./control -7 +47
M ./copyright -2 +11
A ./ghc6-dynamic.dirs
A ./ghc6-haddock.manpages
M ./ghc6.links -1 +1
M ./ghc6.postinst.in -5 +5
M ./haddock.man -9 +9
A ./lintian-overrides/
A ./lintian-overrides/ghc6-dynamic
M ./patches/alpha-tcforeign -12 +12
A ./patches/ghc-6.12.3-ia64-fixed-relax
A ./patches/ghc-6.12.3-ia64-storage-manager-fix
A ./patches/ghc-6.12.3-ia64-use-libffi-for-foreign-import-wrapper
M ./patches/kfreebsd-_gnu_source-565818 -19 +13
M ./patches/series -2 +4
M ./patches/system-libffi -22 +25
M ./rules -16 +24
Tue Jul 20 16:19:20 UTC 2010 Kari Pahula <kaol at debian.org>
* Import of ghc6_6.12.3-1.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog 2011-01-15 06:07:49.249690755 +0000
+++ new-ghc/changelog 2011-01-15 06:07:49.273692019 +0000
@@ -1,3 +1,24 @@
+ghc6 (6.12.3-1) experimental; urgency=low
+
+ * New upstream release
+ * ghci :m now works with module names containing ' (Closes: #580568)
+ * Put haddock and the shared libraries into their own packages.
+ (Closes: #571537)
+ * Only insert packages in gen_contents_index which are both registered
+ and for which the html directory exists.
+ * Use ghc-pkg --global in ghc6's trigger to avoid accessing HOME.
+ (Closes: #578679)
+ * Fix directories in haddock manpage. (Closes: #578321)
+ * Apply some patches from Gentoo (thanks, Sergei Trofimovich) hopefully
+ fixing ia64 build.
+ * Downgrade ghc6's dependency on perl to Suggests and have ghc6-doc
+ depend on perl. (Closes: #553332)
+ * Standards-Version 3.9.0 (no changes necessary)
+ * ghc6 package now provides ghc6-ghci on architectures where it's
+ supported (i386 and amd64 only currently).
+
+ -- Kari Pahula <kaol at debian.org> Tue, 20 Jul 2010 19:19:20 +0300
+
ghc6 (6.12.1-13) unstable; urgency=low
* Remove debian/watcher.sh. (Closes: #571824)
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control 2011-01-15 06:07:49.249690755 +0000
+++ new-ghc/control 2011-01-15 06:07:49.273692019 +0000
@@ -2,18 +2,17 @@
Section: haskell
Priority: optional
Maintainer: Kari Pahula <kaol at debian.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
Build-Depends: debhelper (>= 7), libgmp3-dev, devscripts, ghc6, grep-dctrl, autotools-dev, gcc (>= 4:4.2), procps | hurd, libffi-dev, autoconf, pkg-config, xsltproc, docbook-xsl, docbook-xml, binutils (>= 2.19.51.20090508) [arm armel], libncurses5-dev
Homepage: http://haskell.org/ghc/
Package: ghc6
Architecture: any
-Depends: perl | perl5, gcc (>= 4:4.2), libgmp3-dev, libffi-dev, libbsd-dev, libc6-dev, ${shlibs:Depends}, ${misc:Depends}
-Provides: haskell-compiler, ghc, haddock, ${provided-devs}, ${haskell:Provides}
-Conflicts: ghc4 (<= 4.08.1-4), haddock
-Replaces: haddock, ghc6-doc (= 6.12.1-8)
+Depends: gcc (>= 4:4.2), libgmp3-dev, libffi-dev, libbsd-dev, libc6-dev, ${shlibs:Depends}, ${misc:Depends}
+Provides: haskell-compiler, ghc, ${provided-devs}, ${haskell:Provides}, ${ghci}
+Replaces: ghc6-doc (= 6.12.1-8)
Breaks: cabal-install (<< 0.8.0), haskell-devscripts (<< 0.6.19), ghc6-doc (<= 6.12.1-8)
-Suggests: ghc6-prof, ghc6-doc, haskell-doc
+Suggests: perl, ghc6-prof, ghc6-doc, haskell-doc
Description: GHC - the Glasgow Haskell Compilation system
Version 6 of the Glorious Glasgow Haskell Compilation system (GHC). GHC is
a compiler for Haskell98.
@@ -47,7 +46,7 @@
Architecture: all
Suggests: haskell-doc
Provides: ${provided-docs}
-Depends: ghc6 (>= ${binary:Version}), ${misc:Depends}
+Depends: ghc6-haddock (= ${binary:Version}), ${misc:Depends}, perl
Description: Documentation for the Glasgow Haskell Compilation system
Version 6 of the Glorious Glasgow Haskell Compilation system (GHC). GHC is
a compiler for Haskell98.
@@ -60,3 +59,44 @@
.
This package includes HTML, DVI and PS versions of the SGML-based
documentation around GHC.
+
+Package: ghc6-dynamic
+Architecture: i386 amd64
+Provides: ghc-dynamic
+Depends: ghc6 (= ${binary:Version}), ${misc:Depends}
+Description: Dynamic libraries for the Glasgow Haskell Compilation system
+ Version 6 of the Glorious Glasgow Haskell Compilation system (GHC). GHC is
+ a compiler for Haskell98.
+ .
+ Haskell is "the" standard lazy functional programming language. Haskell98
+ is the current version of the language. The language definition and
+ additional documentation can be found in the `haskell-doc' package.
+ Alternatively, there is an online version at
+ http://haskell.org/onlinereport/.
+ .
+ This package has dynamically linkable, shared versions of the
+ libraries included with GHC. Currently, they are available only on
+ i386 and amd64 architectures.
+
+Package: ghc6-haddock
+Architecture: any
+Provides: haddock
+Conflicts: haddock
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Homepage: http://www.haskell.org/haddock/
+Description: Documentation tool for annotated Haskell source code
+ Haddock is a tool for automatically generating documentation from
+ annotated Haskell source code. It is primary intended for documenting
+ libraries, but it should be useful for any kind of Haskell code.
+ .
+ Haddock lets you write documentation annotations next to the
+ definitions of functions and types in the source code, in a syntax
+ that is easy on the eye when writing the source code (no heavyweight
+ mark-up). The documentation generated by Haddock is fully hyperlinked:
+ click on a type name in a type signature to go straight to the
+ definition, and documentation, for that type.
+ .
+ Haddock can generate documentation in multiple formats; currently HTML
+ is implemented, and there is partial support for generating DocBook.
+ .
+ This package contains Haddock version 2.6.1.
diff -rN -u old-ghc/copyright new-ghc/copyright
--- old-ghc/copyright 2011-01-15 06:07:49.245690544 +0000
+++ new-ghc/copyright 2011-01-15 06:07:49.273692019 +0000
@@ -17,7 +17,7 @@
The Glasgow Haskell Compiler License
-Copyright 2002-2009, The University Court of the University of Glasgow.
+Copyright 2002-2010, The University Court of the University of Glasgow.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -132,7 +132,9 @@
GHC includes utf8-string
-Copyright: Galois Inc, 2007.
+Copyright: Galois Inc, 2007
+ Iavor S. Diatchki, 2009
+ Eric Mertens, 2009
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
@@ -154,3 +156,10 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+distrib/windows-installer-licences.txt states that the components of
+this bundle are distributed under various licenses, including 3 clause
+BSD (as above), The Artistic License (see
+/usr/share/common-licenses/Artistic), GNU GPL v2 (see
+/usr/share/common-licenses/GPL-2) and GNU LGPL v3 (see
+/usr/share/common-licenses/LGPL-3)
diff -rN -u old-ghc/ghc6-dynamic.dirs new-ghc/ghc6-dynamic.dirs
--- old-ghc/ghc6-dynamic.dirs 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/ghc6-dynamic.dirs 2011-01-15 06:07:49.253690966 +0000
@@ -0,0 +1 @@
+/usr/share/lintian/overrides
diff -rN -u old-ghc/ghc6-haddock.manpages new-ghc/ghc6-haddock.manpages
--- old-ghc/ghc6-haddock.manpages 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/ghc6-haddock.manpages 2011-01-15 06:07:49.253690966 +0000
@@ -0,0 +1 @@
+debian/haddock.1
diff -rN -u old-ghc/ghc6.links new-ghc/ghc6.links
--- old-ghc/ghc6.links 2011-01-15 06:07:49.245690544 +0000
+++ new-ghc/ghc6.links 2011-01-15 06:07:49.265691598 +0000
@@ -1 +1 @@
-/var/lib/ghc-6.12.1/package.conf.d /usr/lib/ghc-6.12.1/package.conf.d
+/var/lib/ghc-6.12.3/package.conf.d /usr/lib/ghc-6.12.3/package.conf.d
diff -rN -u old-ghc/ghc6.postinst.in new-ghc/ghc6.postinst.in
--- old-ghc/ghc6.postinst.in 2011-01-15 06:07:49.245690544 +0000
+++ new-ghc/ghc6.postinst.in 2011-01-15 06:07:49.269691808 +0000
@@ -37,7 +37,7 @@
case "$1" in
configure|abort-upgrade|abort-remove|abort-deconfigure)
- $bindir/ghc-pkg recache
+ $bindir/ghc-pkg recache --global
if [ -n "$NEED_INTERPRETER" ] ; then
update-alternatives \
--install $execdir/runhaskell runhaskell $execdir/runghc6 8600000600 \
@@ -56,12 +56,12 @@
--slave $mandir/man1/ghc.1.gz ghc.1.gz $mandir/man1/ghc6.1.gz \
--slave $mandir/man1/ghc-pkg.1.gz ghc-pkg.1.gz $mandir/man1/ghc-pkg6.1.gz \
--slave $execdir/hasktags hasktags $bindir/hasktags $NEED_INTERPRETER
- $bindir/ghc-pkg recache
- $bindir/ghc-pkg check || true
+ $bindir/ghc-pkg recache --global
+ $bindir/ghc-pkg check --global || true
;;
triggered)
- $bindir/ghc-pkg recache
- $bindir/ghc-pkg check || true
+ $bindir/ghc-pkg recache --global
+ $bindir/ghc-pkg check --global || true
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
diff -rN -u old-ghc/haddock.man new-ghc/haddock.man
--- old-ghc/haddock.man 2011-01-15 06:07:49.245690544 +0000
+++ new-ghc/haddock.man 2011-01-15 06:07:49.253690966 +0000
@@ -1,4 +1,4 @@
-.TH HADDOCK 1 "September 2006" "Haddock, version 0.8" "Haddock documentation generator"
+.TH HADDOCK 1 "July 2010" "Haddock, version 2.6.1" "Haddock documentation generator"
.SH NAME
@@ -195,17 +195,17 @@
.SH FILES
.I /usr/bin/haddock
.br
-.I /usr/share/haddock-0.8/html/plus.gif
+.I /usr/share/haddock-2.6.1/html/plus.gif
.br
-.I /usr/share/haddock-0.8/html/minus.gif
+.I /usr/share/haddock-2.6.1/html/minus.gif
.br
-.I /usr/share/haddock-0.8/html/haskell_icon.gif
+.I /usr/share/haddock-2.6.1/html/haskell_icon.gif
.br
-.I /usr/share/haddock-0.8/html/haddock.js
+.I /usr/share/haddock-2.6.1/html/haddock.js
.br
-.I /usr/share/haddock-0.8/html/haddock.css
+.I /usr/share/haddock-2.6.1/html/haddock.css
.br
-.I /usr/share/haddock-0.8/html/haddock-DEBUG.css
+.I /usr/share/haddock-2.6.1/html/haddock-DEBUG.css
.SH SEE ALSO
.IR /usr/share/doc/haddock/ ,
@@ -216,9 +216,9 @@
.UE
.SH COPYRIGHT
-Haddock version 0.8
+Haddock version 2.6.1
-Copyright 2006 Simon Marlow <simonmar at microsoft.com>.
+Copyright 2006-2010 Simon Marlow <simonmar at microsoft.com>, Dawid Waern <david.waern at gmail.com>.
All rights reserved.
diff -rN -u old-ghc/lintian-overrides/ghc6-dynamic new-ghc/lintian-overrides/ghc6-dynamic
--- old-ghc/lintian-overrides/ghc6-dynamic 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/lintian-overrides/ghc6-dynamic 2011-01-15 06:07:49.253690966 +0000
@@ -0,0 +1,2 @@
+# the dep on ghc6 pulls in the needed libraries
+ghc6-dynamic: missing-dependency-on-libc
diff -rN -u old-ghc/patches/alpha-tcforeign new-ghc/patches/alpha-tcforeign
--- old-ghc/patches/alpha-tcforeign 2011-01-15 06:07:49.245690544 +0000
+++ new-ghc/patches/alpha-tcforeign 2011-01-15 06:07:49.261691387 +0000
@@ -1,7 +1,7 @@
-Index: ghc6-6.12.1/compiler/typecheck/TcForeign.lhs
+Index: ghc6-6.12.3/compiler/typecheck/TcForeign.lhs
===================================================================
---- ghc6-6.12.1.orig/compiler/typecheck/TcForeign.lhs 2010-02-06 12:41:37.000000000 +0200
-+++ ghc6-6.12.1/compiler/typecheck/TcForeign.lhs 2010-02-09 16:01:06.000000000 +0200
+--- ghc6-6.12.3.orig/compiler/typecheck/TcForeign.lhs 2010-07-17 16:13:18.000000000 +0300
++++ ghc6-6.12.3/compiler/typecheck/TcForeign.lhs 2010-07-17 16:14:17.000000000 +0300
@@ -30,10 +30,6 @@
import ForeignCall
import ErrUtils
@@ -52,10 +52,10 @@
\end{code}
-Index: ghc6-6.12.1/rts/eventlog/EventLog.c
+Index: ghc6-6.12.3/rts/eventlog/EventLog.c
===================================================================
---- ghc6-6.12.1.orig/rts/eventlog/EventLog.c 2010-02-08 13:55:22.000000000 +0200
-+++ ghc6-6.12.1/rts/eventlog/EventLog.c 2010-02-09 16:01:35.000000000 +0200
+--- ghc6-6.12.3.orig/rts/eventlog/EventLog.c 2010-07-17 16:13:58.000000000 +0300
++++ ghc6-6.12.3/rts/eventlog/EventLog.c 2010-07-17 16:14:17.000000000 +0300
@@ -83,7 +83,7 @@
static void postEventType(EventsBuf *eb, EventType *et);
@@ -65,7 +65,7 @@
static void postBlockMarker(EventsBuf *eb);
static void closeBlockMarker(EventsBuf *ebuf);
-@@ -395,12 +395,16 @@
+@@ -399,12 +399,16 @@
#define BUF 512
@@ -84,7 +84,7 @@
if (size > BUF) {
buf[BUF-1] = '\0';
size = BUF;
-@@ -419,13 +423,13 @@
+@@ -423,13 +427,13 @@
void postMsg(char *msg, va_list ap)
{
ACQUIRE_LOCK(&eventBufMutex);
@@ -99,11 +99,11 @@
+ postLogMsg(&capEventBuf[cap->no], EVENT_LOG_MSG, msg, &ap);
}
- void postUserMsg(Capability *cap, char *msg)
-Index: ghc6-6.12.1/rts/Trace.c
+ void postUserMsg(Capability *cap, char *msg, va_list ap)
+Index: ghc6-6.12.3/rts/Trace.c
===================================================================
---- ghc6-6.12.1.orig/rts/Trace.c 2010-02-09 16:02:07.000000000 +0200
-+++ ghc6-6.12.1/rts/Trace.c 2010-02-09 16:03:03.000000000 +0200
+--- ghc6-6.12.3.orig/rts/Trace.c 2010-07-17 16:14:15.000000000 +0300
++++ ghc6-6.12.3/rts/Trace.c 2010-07-17 16:14:17.000000000 +0300
@@ -218,13 +218,16 @@
}
diff -rN -u old-ghc/patches/ghc-6.12.3-ia64-fixed-relax new-ghc/patches/ghc-6.12.3-ia64-fixed-relax
--- old-ghc/patches/ghc-6.12.3-ia64-fixed-relax 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/ghc-6.12.3-ia64-fixed-relax 2011-01-15 06:07:49.257691176 +0000
@@ -0,0 +1,35 @@
+commit 7b45030b81fb0588b858400c051f9f7c10ef2760
+Author: Sergei Trofimovich <slyfox at gentoo.org>
+Date: Tue Jul 6 11:39:18 2010 +0300
+
+ Fixing link failure of compiler on ia64 ('-Wl,' prefixed value passed directly to ld)
+
+ /usr/bin/ld -Wl,--relax -r -o dist-stage1/build/HSghc-6.10.4.o \
+ dist-stage1/build/BasicTypes.o dist-stage1/build/DataCon.o ...
+ /usr/bin/ld: unrecognized option '-Wl,--relax'
+
+ If we just drop '-Wl,' part it will not help as '-r' and '--relax' are incompatible.
+
+ Looks like '-Wl,--relax' was skipped by earlier binutils' ld as unknown option.
+ Removing ia64 specific path.
+
+ Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>
+
+diff --git a/compiler/ghc.mk b/compiler/ghc.mk
+index 6b25efa..29d3ade 100644
+--- a/compiler/ghc.mk
++++ b/compiler/ghc.mk
+@@ -337,13 +337,6 @@ ifeq "$(TargetOS_CPP)" "openbsd"
+ compiler_CONFIGURE_OPTS += --ld-options=-E
+ endif
+
+-ifeq "$(GhcUnregisterised)" "NO"
+-ifeq "$(HOSTPLATFORM)" "ia64-unknown-linux"
+-# needed for generating proper relocation in large binaries: trac #856
+-compiler_CONFIGURE_OPTS += --ld-option=-Wl,--relax
+-endif
+-endif
+-
+ # We need to turn on profiling either if we have been asked to
+ # (GhcLibProfiled = YES) or if we want GHC itself to be compiled with
+ # profiling enabled (GhcProfiled = YES).
diff -rN -u old-ghc/patches/ghc-6.12.3-ia64-storage-manager-fix new-ghc/patches/ghc-6.12.3-ia64-storage-manager-fix
--- old-ghc/patches/ghc-6.12.3-ia64-storage-manager-fix 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/ghc-6.12.3-ia64-storage-manager-fix 2011-01-15 06:07:49.257691176 +0000
@@ -0,0 +1,62 @@
+storage manager: preserve upper address bits on 64bit machines (thanks to zygoloid)
+
+the issue: durin ia64 ghc bootstrap (both 6.10.4 and 6.12.3) I
+got the failure on stage2 phase:
+ "inplace/bin/ghc-stage2" -H32m -O -H64m -O0 -w ...
+ ghc-stage2: internal error: evacuate: strange closure type 15
+ (GHC version 6.12.3 for ia64_unknown_linux)
+ Please report this as a GHC bug: http://www.haskell.org/ghc/reportabug
+ make[1]: *** [libraries/dph/dph-base/dist-install/build/Data/Array/Parallel/Base/Hyperstrict.o] Aborted
+
+I attached gdb and got backtrace:
+
+Breakpoint 1 at 0x400000000469ec31: file rts/RtsMessages.c, line 39.
+(gdb) run -B/var/tmp/portage/dev-lang/ghc-6.12.3/work/ghc-6.12.3/inplace/bin --info
+Starting program: /var/tmp/portage/dev-lang/ghc-6.12.3/work/ghc-6.12.3/inplace/lib/ghc-stage2 -B/var/tmp/portage/dev-lang/ghc-6.12.3/work/ghc-6.12.3/inplace/bin --info
+[Thread debugging using libthread_db enabled]
+
+Breakpoint 1, barf (s=0x40000000047915b0 "evacuate: strange closure type %d") at rts/RtsMessages.c:39
+39 va_start(ap,s);
+(gdb) bt
+#0 barf (s=0x40000000047915b0 "evacuate: strange closure type %d") at rts/RtsMessages.c:39
+#1 0x400000000474a1e0 in evacuate (p=0x6000000000147958) at rts/sm/Evac.c:756
+#2 0x40000000046d68c0 in scavenge_srt (srt=0x6000000000147958, srt_bitmap=7) at rts/sm/Scav.c:348
+...
+
+> 16:52:53 < zygoloid> slyfox: i'm no ghc expert but it looks like HEAP_ALLOCED_GC(q)
+> is returning true for a FUN_STATIC closure
+> 17:18:43 < zygoloid> try: p HEAP_ALLOCED_miss((unsigned long)(*p) >> 20, *p)
+> 17:19:12 < slyfox> (gdb) p HEAP_ALLOCED_miss((unsigned long)(*p) >> 20, *p)
+> 17:19:12 < slyfox> $1 = 0
+> 17:19:40 < zygoloid> i /think/ that means the mblock_cache is broken
+> 17:22:45 < zygoloid> i can't help further. however i am suspicious that you seem to have pointers with similar-looking low 33
+> bits and different high 4 bits, and it looks like such pointers get put into the same bucket in
+> mblock_cache.
+...
+> 17:36:16 < zygoloid> slyfox: try changing the definition of MbcCacheLine to StgWord64, see if that helps
+> 17:36:31 < zygoloid> that's in includes/rts/storage/MBlock.h
+And it helped!
+
+diff --git a/includes/rts/storage/MBlock.h b/includes/rts/storage/MBlock.h
+index 0943d4c..a113498 100644
+--- a/includes/rts/storage/MBlock.h
++++ b/includes/rts/storage/MBlock.h
+@@ -126,7 +126,17 @@ extern StgWord8 mblock_map[];
+
+ #define MBC_LINE_BITS 0
+ #define MBC_TAG_BITS 15
+-typedef StgWord32 MbcCacheLine; // could use 16, but 32 was faster
++
++#if x86_64_HOST_ARCH
++// 32bits are enough for 'entry' as modern amd64 boxes have
++// only 48bit sized virtual addres.
++typedef StgWord32 MbcCacheLine;
++#else
++// 32bits is not enough here as some arches (like ia64) use
++// upper address bits to distinct memory areas.
++typedef StgWord64 MbcCacheLine;
++#endif
++
+ typedef StgWord8 MBlockMapLine;
+
+ #define MBLOCK_MAP_LINE(p) (((StgWord)p & 0xffffffff) >> (MBLOCK_SHIFT + MBC_LINE_BITS))
diff -rN -u old-ghc/patches/ghc-6.12.3-ia64-use-libffi-for-foreign-import-wrapper new-ghc/patches/ghc-6.12.3-ia64-use-libffi-for-foreign-import-wrapper
--- old-ghc/patches/ghc-6.12.3-ia64-use-libffi-for-foreign-import-wrapper 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/ghc-6.12.3-ia64-use-libffi-for-foreign-import-wrapper 2011-01-15 06:07:49.257691176 +0000
@@ -0,0 +1,13 @@
+Index: ghc6-6.12.3/mk/config.mk.in
+===================================================================
+--- ghc6-6.12.3.orig/mk/config.mk.in 2010-06-09 21:10:13.000000000 +0300
++++ ghc6-6.12.3/mk/config.mk.in 2010-07-17 12:31:17.000000000 +0300
+@@ -176,7 +176,7 @@
+ # Whether to use libffi for adjustors (foreign import "wrapper") or
+ # not. If we have built-in support (rts/Adjustor.c) then we use that,
+ # otherwise we fall back on libffi, which is slightly slower.
+-ArchHasAdjustorSupport=$(strip $(if $(findstring $(HostArch_CPP),i386 x86_64 alpha powerpc ia64,),YES,NO))
++ArchHasAdjustorSupport=$(strip $(if $(findstring $(HostArch_CPP),i386 x86_64 alpha powerpc,),YES,NO))
+ ifeq "$(ArchHasAdjustorSupport)" "YES"
+ UseLibFFIForAdjustors=NO
+ else
diff -rN -u old-ghc/patches/kfreebsd-_gnu_source-565818 new-ghc/patches/kfreebsd-_gnu_source-565818
--- old-ghc/patches/kfreebsd-_gnu_source-565818 2011-01-15 06:07:49.241690334 +0000
+++ new-ghc/patches/kfreebsd-_gnu_source-565818 2011-01-15 06:07:49.261691387 +0000
@@ -1,7 +1,7 @@
-Index: ghc6-6.12.1/rts/posix/OSThreads.c
+Index: ghc6-6.12.3/rts/posix/OSThreads.c
===================================================================
---- ghc6-6.12.1.orig/rts/posix/OSThreads.c 2010-01-27 21:55:58.000000000 +0200
-+++ ghc6-6.12.1/rts/posix/OSThreads.c 2010-01-27 21:56:53.000000000 +0200
+--- ghc6-6.12.3.orig/rts/posix/OSThreads.c 2010-06-09 21:10:14.000000000 +0300
++++ ghc6-6.12.3/rts/posix/OSThreads.c 2010-07-17 12:17:25.000000000 +0300
@@ -7,10 +7,10 @@
*
* --------------------------------------------------------------------------*/
@@ -15,10 +15,10 @@
#endif
#include "PosixSource.h"
-Index: ghc6-6.12.1/driver/mangler/ghc-asm.lprl
+Index: ghc6-6.12.3/driver/mangler/ghc-asm.lprl
===================================================================
---- ghc6-6.12.1.orig/driver/mangler/ghc-asm.lp[...incomplete...]
More information about the Pkg-haskell-commits
mailing list