[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.10.1+dfsg1-4.dsc
Kari Pahula
kaol at debian.org
Sat Jan 15 06:06:00 UTC 2011
Mon Jan 26 13:10:54 UTC 2009 Kari Pahula <kaol at debian.org>
* Import of ghc6_6.10.1+dfsg1-4.dsc
M ./changelog +9
M ./control -1 +1
M ./patches/ld-relax-ia64-fix -9 +14
R ./patches/readline-not-editline
M ./rules -2 +3
Mon Jan 26 13:10:54 UTC 2009 Kari Pahula <kaol at debian.org>
* Import of ghc6_6.10.1+dfsg1-4.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog 2011-01-15 06:05:59.739922654 +0000
+++ new-ghc/changelog 2011-01-15 06:06:00.015937194 +0000
@@ -1,3 +1,12 @@
+ghc6 (6.10.1+dfsg1-4) experimental; urgency=low
+
+ * Add pkg-config as a build dep.
+ * Explicitly build an unregisterised version of the compiler on other
+ arches but i386, amd64, powerpc, ia64. (Closes: #512827)
+ * Remove --relax altogether from ia64's ld flags.
+
+ -- Kari Pahula <kaol at debian.org> Mon, 26 Jan 2009 15:10:54 +0200
+
ghc6 (6.10.1+dfsg1-3) experimental; urgency=low
* Again, use the same build options for all arches and just use what
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control 2011-01-15 06:05:59.739922654 +0000
+++ new-ghc/control 2011-01-15 06:06:00.015937194 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Kari Pahula <kaol at debian.org>
Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 4), libgmp3-dev, xsltproc, libedit-dev, devscripts, ghc6, grep-dctrl, autotools-dev, docbook-xsl, docbook-xml, gcc (>= 4:4.2), procps | hurd, quilt, libffi-dev, autoconf
+Build-Depends: debhelper (>= 4), libgmp3-dev, xsltproc, libedit-dev, devscripts, ghc6, grep-dctrl, autotools-dev, docbook-xsl, docbook-xml, gcc (>= 4:4.2), procps | hurd, quilt, libffi-dev, autoconf, pkg-config
Homepage: http://haskell.org/
Package: ghc6
diff -rN -u old-ghc/patches/ld-relax-ia64-fix new-ghc/patches/ld-relax-ia64-fix
--- old-ghc/patches/ld-relax-ia64-fix 2011-01-15 06:05:59.739922654 +0000
+++ new-ghc/patches/ld-relax-ia64-fix 2011-01-15 06:05:59.959934244 +0000
@@ -1,13 +1,18 @@
Index: ghc6-6.10.1+dfsg1/compiler/Makefile
===================================================================
---- ghc6-6.10.1+dfsg1.orig/compiler/Makefile 2009-01-21 23:25:59.000000000 +0200
-+++ ghc6-6.10.1+dfsg1/compiler/Makefile 2009-01-21 23:31:41.000000000 +0200
-@@ -144,7 +144,7 @@
- ifeq "$(GhcUnregisterised)" "NO"
- ifeq "$(HOSTPLATFORM)" "ia64-unknown-linux"
- # needed for generating proper relocation in large binaries: trac #856
--COMMON_CONFIGURE_FLAGS += --ld-option=-Wl,--relax
-+COMMON_CONFIGURE_FLAGS += --ld-option=--relax
- endif
+--- ghc6-6.10.1+dfsg1.orig/compiler/Makefile 2009-01-26 11:14:44.000000000 +0200
++++ ghc6-6.10.1+dfsg1/compiler/Makefile 2009-01-26 11:15:11.000000000 +0200
+@@ -141,13 +141,6 @@
+ COMMON_CONFIGURE_FLAGS += --ld-options=-E
endif
+-ifeq "$(GhcUnregisterised)" "NO"
+-ifeq "$(HOSTPLATFORM)" "ia64-unknown-linux"
+-# needed for generating proper relocation in large binaries: trac #856
+-COMMON_CONFIGURE_FLAGS += --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/readline-not-editline new-ghc/patches/readline-not-editline
--- old-ghc/patches/readline-not-editline 2011-01-15 06:05:59.739922654 +0000
+++ new-ghc/patches/readline-not-editline 1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-Index: ghc6-6.10.1+dfsg1/compiler/ghc.cabal.in
-===================================================================
---- ghc6-6.10.1+dfsg1.orig/compiler/ghc.cabal.in 2009-01-17 09:23:33.000000000 +0200
-+++ ghc6-6.10.1+dfsg1/compiler/ghc.cabal.in 2009-01-17 09:30:06.000000000 +0200
-@@ -72,7 +72,7 @@
- Build-Depends: unix
-
- if flag(editline)
-- Build-Depends: editline
-+ Build-Depends: readline
- CPP-Options: -DUSE_EDITLINE
-
- GHC-Options: -Wall -fno-warn-name-shadowing -fno-warn-orphans
-Index: ghc6-6.10.1+dfsg1/compiler/ghci/InteractiveUI.hs
-===================================================================
---- ghc6-6.10.1+dfsg1.orig/compiler/ghci/InteractiveUI.hs 2009-01-17 09:23:33.000000000 +0200
-+++ ghc6-6.10.1+dfsg1/compiler/ghci/InteractiveUI.hs 2009-01-17 10:56:00.000000000 +0200
-@@ -66,7 +66,7 @@
-
- #ifdef USE_EDITLINE
- import Control.Concurrent ( yield ) -- Used in readline loop
--import System.Console.Editline.Readline as Readline
-+import System.Console.Readline as Readline
- #endif
-
- --import SystemExts
-@@ -326,10 +326,6 @@
- when is_tty $ withReadline $ do
- Readline.initialize
-
-- withGhcAppData
-- (\dir -> Readline.readHistory (dir </> "ghci_history"))
-- (return True)
--
- Readline.setAttemptedCompletionFunction (Just completeWord)
- --Readline.parseAndBind "set show-all-if-ambiguous 1"
-
-@@ -367,9 +363,6 @@
-
- #ifdef USE_EDITLINE
- liftIO $ do
-- Readline.stifleHistory 100
-- withGhcAppData (\dir -> Readline.writeHistory (dir </> "ghci_history"))
-- (return True)
- Readline.resetTerminal Nothing
- #endif
-
-Index: ghc6-6.10.1+dfsg1/libraries/Makefile
-===================================================================
---- ghc6-6.10.1+dfsg1.orig/libraries/Makefile 2009-01-17 09:23:33.000000000 +0200
-+++ ghc6-6.10.1+dfsg1/libraries/Makefile 2009-01-17 09:35:10.000000000 +0200
-@@ -46,7 +46,7 @@
- ifeq "$(Windows)" "YES"
- SUBDIRS += $(wildcard Win32)
- endif
--SUBDIRS += directory process pretty hpc template-haskell editline Cabal random haskell98
-+SUBDIRS += directory process pretty hpc template-haskell readline Cabal random haskell98
-
- # Set GhcBootLibs=YES from the command line to work with just the libraries
- # needed to bootstrap GHC.
-Index: ghc6-6.10.1+dfsg1/mk/config.mk.in
-===================================================================
---- ghc6-6.10.1+dfsg1.orig/mk/config.mk.in 2009-01-17 14:08:08.000000000 +0200
-+++ ghc6-6.10.1+dfsg1/mk/config.mk.in 2009-01-17 14:08:30.000000000 +0200
-@@ -890,7 +890,7 @@
- GhcDir = $(dir $(GHC))
-
- # Set to YES if $(GHC) has the editline package installed
--GhcHasEditline = @GhcHasEditline@
-+GhcHasEditline = YES
-
- HBC = @HBC@
- NHC = @NHC@
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules 2011-01-15 06:05:59.739922654 +0000
+++ new-ghc/rules 2011-01-15 06:06:00.015937194 +0000
@@ -37,8 +37,9 @@
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
+ifeq '$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), i386 amd64 powerpc ia64)' ''
+ echo "GhcUnregisterised=YES" >> mk/build.mk
+endif
# echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
# echo "GhcWithInterpreter=NO" >> mk/build.mk
# echo "SplitObjs=NO" >> mk/build.mk
More information about the Pkg-haskell-commits
mailing list