[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.10.1+dfsg1-3.dsc

[Kari Pahula]

Fri Jan 23 06:24:45 UTC 2009  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.10.1+dfsg1-3.dsc

    M ./changelog +7
    M ./control -1 +1
    M ./rules -6 +6

Fri Jan 23 06:24:45 UTC 2009  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.10.1+dfsg1-3.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-01-15 06:05:58.211842156 +0000
+++ new-ghc/changelog	2011-01-15 06:05:58.495857118 +0000
@@ -1,3 +1,10 @@
+ghc6 (6.10.1+dfsg1-3) experimental; urgency=low
+
+  * Again, use the same build options for all arches and just use what
+    arch-specific exceptions upstream provided.
+
+ -- Kari Pahula <kaol at debian.org>  Fri, 23 Jan 2009 08:24:45 +0200
+
 ghc6 (6.10.1+dfsg1-2) experimental; urgency=low
 
   * Patched the build system to use haddock from /usr/bin/, not build its
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2011-01-15 06:05:58.211842156 +0000
+++ new-ghc/control	2011-01-15 06:05:58.495857118 +0000
@@ -46,7 +46,7 @@
 Architecture: all
 Suggests: haskell-doc
 Provides: ${provided-docs}
-Depends: haddock (>= 2.4.1-1), ${misc:Depends}
+Depends: ${misc:Depends}
 Description: Documentation for the Glasgow Haskell Compilation system
  Version 6 of the Glorious Glasgow Haskell Compilation system (GHC).  GHC is
  a compiler for Haskell98.
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2011-01-15 06:05:58.211842156 +0000
+++ new-ghc/rules	2011-01-15 06:05:58.495857118 +0000
@@ -37,16 +37,16 @@
 	echo "HADDOCK_DOCS := $(BUILD_HADDOCK_DOCS)" >> mk/build.mk
 	echo "GhcRTSWays += debug_p thr_debug thr_debug_p" >> mk/build.mk
 	echo "XSLTPROC_OPTS += --nonet" >> mk/build.mk
-ifeq '$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), i386 amd64)' ''
-	echo "GhcUnregisterised=YES" >> mk/build.mk
-	echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
-	echo "GhcWithInterpreter=NO" >> mk/build.mk
-	echo "SplitObjs=NO" >> mk/build.mk
+#ifeq '$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), i386 amd64)' ''
+#	echo "GhcUnregisterised=YES" >> mk/build.mk
+#	echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
+#	echo "GhcWithInterpreter=NO" >> mk/build.mk
+#	echo "SplitObjs=NO" >> mk/build.mk
 # Let's see if we could do without this with 6.10.1.
 #	# The threaded RTS doesn't seem happy on non-x86/amd64
 #	echo 'GhcRTSWays := $$(shell echo $$(GhcRTSWays) | sed "s/\<[a-z_]*thr[a-z_]*\>//g")' >> mk/build.mk
 #	echo "GhcNotThreaded=YES" >> mk/build.mk
-endif
+#endif
 ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	echo "SRC_HC_OPTS   += -H32m -O0" >> mk/build.mk
 	echo "GhcHcOpts     += -Rghc-timing -DDEBUG" >> mk/build.mk