[Pkg-haskell-commits] darcs: ghc: Refresh patches
Joachim Breitner
mail at joachim-breitner.de
Mon Jun 15 08:28:55 UTC 2015
Mon Jun 15 07:36:48 UTC 2015 Joachim Breitner <mail at joachim-breitner.de>
* Refresh patches
M ./changelog -3 +4
M ./patches/PPC-relocations.patch -5 +5
M ./patches/ghc-7.8.4-3-aarch64.patch -32 +16
M ./patches/hurd.diff -8 +8
M ./patches/no-missing-haddock-file-warning -4 +4
R ./patches/reproducible-tmp-names
M ./patches/series -1
Mon Jun 15 07:36:48 UTC 2015 Joachim Breitner <mail at joachim-breitner.de>
* Refresh patches
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog 2015-06-15 08:28:55.137671627 +0000
+++ new-ghc/changelog 2015-06-15 08:28:55.161671623 +0000
@@ -1,9 +1,10 @@
-ghc (7.10.1-6) UNRELEASED; urgency=medium
+ghc (7.10.1.20150612-1) UNRELEASED; urgency=medium
* Calculate haddock interface version using the built haddock, not the
installed (Thanks to David Fox for noticing).
+ * New upstream release randidate (7.10.2-rc1)
- -- Joachim Breitner <nomeata at debian.org> Sun, 07 Jun 2015 13:46:18 +0200
+ -- Joachim Breitner <nomeata at debian.org> Mon, 15 Jun 2015 09:26:23 +0200
ghc (7.10.1-5) experimental; urgency=medium
diff -rN -u old-ghc/patches/ghc-7.8.4-3-aarch64.patch new-ghc/patches/ghc-7.8.4-3-aarch64.patch
--- old-ghc/patches/ghc-7.8.4-3-aarch64.patch 2015-06-15 08:28:55.133671627 +0000
+++ new-ghc/patches/ghc-7.8.4-3-aarch64.patch 2015-06-15 08:28:55.153671623 +0000
@@ -1,35 +1,19 @@
-Provided by Edmund Grimley Evans in http://bugs.debian.org/783987 based on
-
-https://git.haskell.org/ghc.git/commit/0bbc2ac6dae9ce2838f23a75a6a989826c06f3f5
-https://git.haskell.org/ghc.git/commit/1e8c9b81a819da8eb54405a029fc33a9f5220321
-
-Not in 7.10.1, but one patch likely to be in 7.10.2, see
-https://ghc.haskell.org/trac/ghc/ticket/9673
-
-
-Index: ghc-7.10.1/aclocal.m4
+Provided by Edmund Grimley Evans in http://bugs.debian.org/783987 based on
+
+https://git.haskell.org/ghc.git/commit/1e8c9b81a819da8eb54405a029fc33a9f5220321
+
+Not in 7.10.2-rc1, but maybe we can fix that before 7.10.2:
+https://ghc.haskell.org/trac/ghc/ticket/9673
+
+
+Index: ghc-7.10/aclocal.m4
===================================================================
---- ghc-7.10.1.orig/aclocal.m4 2015-05-12 12:41:52.000000000 +0200
-+++ ghc-7.10.1/aclocal.m4 2015-05-14 23:16:10.221224576 +0200
-@@ -568,9 +568,11 @@
- $3="$$3 -D_HPUX_SOURCE"
- $5="$$5 -D_HPUX_SOURCE"
- ;;
-- arm*linux*)
-- # On arm/linux and arm/android, tell gcc to link using the gold linker.
-- # Forcing LD to be ld.gold is done in configre.ac.
-+ arm*linux* | \
-+ aarch64*linux* )
-+ # On arm/linux, aarch64/linux, arm/android and aarch64/android, tell
-+ # gcc to link using the gold linker.
-+ # Forcing LD to be ld.gold is done in FIND_LD m4 macro.
- $3="$$3 -fuse-ld=gold"
- ;;
- esac
-@@ -2121,6 +2123,30 @@
- fi
+--- ghc-7.10.orig/aclocal.m4 2015-06-15 09:29:12.405875831 +0200
++++ ghc-7.10/aclocal.m4 2015-06-15 09:29:12.405875831 +0200
+@@ -2163,6 +2163,30 @@
])
+
+# FIND_LD
+# Find the version of `ld` to use. This is used in both in the top level
+# configure.ac and in distrib/configure.ac.in.
@@ -57,10 +41,10 @@
# FIND_GCC()
# --------------------------------
# Finds where gcc is
-Index: ghc-7.10.1/mk/config.mk.in
+Index: ghc-7.10/mk/config.mk.in
===================================================================
---- ghc-7.10.1.orig/mk/config.mk.in 2015-05-12 10:54:02.000000000 +0200
-+++ ghc-7.10.1/mk/config.mk.in 2015-05-12 12:41:52.000000000 +0200
+--- ghc-7.10.orig/mk/config.mk.in 2015-06-15 09:29:12.405875831 +0200
++++ ghc-7.10/mk/config.mk.in 2015-06-15 09:29:12.405875831 +0200
@@ -172,7 +172,7 @@
# ArchSupportsSMP should be set iff there is support for that arch in
diff -rN -u old-ghc/patches/hurd.diff new-ghc/patches/hurd.diff
--- old-ghc/patches/hurd.diff 2015-06-15 08:28:55.133671627 +0000
+++ new-ghc/patches/hurd.diff 2015-06-15 08:28:55.153671623 +0000
@@ -1,9 +1,9 @@
Provided by “Pino†via Samuel Thibault. Not yet pushed upstream.
-Index: ghc-7.10.1/aclocal.m4
+Index: ghc-7.10/aclocal.m4
===================================================================
---- ghc-7.10.1.orig/aclocal.m4 2015-05-11 22:26:43.282047557 +0200
-+++ ghc-7.10.1/aclocal.m4 2015-05-11 22:26:49.254449440 +0200
+--- ghc-7.10.orig/aclocal.m4 2015-06-15 09:26:58.080646221 +0200
++++ ghc-7.10/aclocal.m4 2015-06-15 09:26:58.076646183 +0200
@@ -271,12 +271,15 @@
nto-qnx)
test -z "[$]2" || eval "[$]2=OSQNXNTO"
@@ -21,11 +21,11 @@
*)
echo "Unknown OS '[$]1'"
exit 1
-Index: ghc-7.10.1/compiler/utils/Platform.hs
+Index: ghc-7.10/compiler/utils/Platform.hs
===================================================================
---- ghc-7.10.1.orig/compiler/utils/Platform.hs 2015-05-11 22:26:43.282047557 +0200
-+++ ghc-7.10.1/compiler/utils/Platform.hs 2015-05-11 22:26:43.278047288 +0200
-@@ -82,6 +82,7 @@
+--- ghc-7.10.orig/compiler/utils/Platform.hs 2015-06-15 09:26:58.080646221 +0200
++++ ghc-7.10/compiler/utils/Platform.hs 2015-06-15 09:26:58.076646183 +0200
+@@ -83,6 +83,7 @@
| OSOsf3
| OSQNXNTO
| OSAndroid
@@ -33,7 +33,7 @@
deriving (Read, Show, Eq)
-- | ARM Instruction Set Architecture, Extensions and ABI
-@@ -126,6 +127,7 @@
+@@ -127,6 +128,7 @@
-- per comment below it's safe
osElfTarget OSQNXNTO = False
osElfTarget OSAndroid = True
diff -rN -u old-ghc/patches/no-missing-haddock-file-warning new-ghc/patches/no-missing-haddock-file-warning
--- old-ghc/patches/no-missing-haddock-file-warning 2015-06-15 08:28:55.133671627 +0000
+++ new-ghc/patches/no-missing-haddock-file-warning 2015-06-15 08:28:55.153671623 +0000
@@ -3,11 +3,11 @@
without the -doc package.
Author: Joachim Breitner <nomeata at debian.org>
-Index: ghc-7.10.1/utils/ghc-pkg/Main.hs
+Index: ghc-7.10/utils/ghc-pkg/Main.hs
===================================================================
---- ghc-7.10.1.orig/utils/ghc-pkg/Main.hs 2015-05-11 22:23:52.846578947 +0200
-+++ ghc-7.10.1/utils/ghc-pkg/Main.hs 2015-05-11 22:24:20.776458349 +0200
-@@ -1510,8 +1510,10 @@
+--- ghc-7.10.orig/utils/ghc-pkg/Main.hs 2015-06-15 09:26:54.388610803 +0200
++++ ghc-7.10/utils/ghc-pkg/Main.hs 2015-06-15 09:26:54.384610765 +0200
+@@ -1528,8 +1528,10 @@
mapM_ (checkDir True "library-dirs") (libraryDirs pkg)
mapM_ (checkDir True "include-dirs") (includeDirs pkg)
mapM_ (checkDir True "framework-dirs") (frameworkDirs pkg)
diff -rN -u old-ghc/patches/PPC-relocations.patch new-ghc/patches/PPC-relocations.patch
--- old-ghc/patches/PPC-relocations.patch 2015-06-15 08:28:55.137671627 +0000
+++ new-ghc/patches/PPC-relocations.patch 2015-06-15 08:28:55.153671623 +0000
@@ -9,11 +9,11 @@
rts/Linker.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
-Index: ghc-7.10.1/rts/Linker.c
+Index: ghc-7.10/rts/Linker.c
===================================================================
---- ghc-7.10.1.orig/rts/Linker.c 2015-05-21 12:51:06.803899231 +0200
-+++ ghc-7.10.1/rts/Linker.c 2015-05-21 12:51:06.799899140 +0200
-@@ -5944,6 +5944,7 @@
+--- ghc-7.10.orig/rts/Linker.c 2015-06-15 09:30:13.062408171 +0200
++++ ghc-7.10/rts/Linker.c 2015-06-15 09:30:13.058408137 +0200
+@@ -5957,6 +5957,7 @@
break;
case R_PPC_REL24:
@@ -21,7 +21,7 @@
delta = value - P;
if( delta << 6 >> 6 != delta )
-@@ -5963,6 +5964,18 @@
+@@ -5976,6 +5977,18 @@
*(Elf_Word *) P = (*(Elf_Word *) P & 0xfc000003)
| (delta & 0x3fffffc);
break;
diff -rN -u old-ghc/patches/reproducible-tmp-names new-ghc/patches/reproducible-tmp-names
--- old-ghc/patches/reproducible-tmp-names 2015-06-15 08:28:55.133671627 +0000
+++ new-ghc/patches/reproducible-tmp-names 1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-This is an attempt to make GHC build reproducible. The name of .c files may end
-up in the resulting binary (in the debug section), but not the directory.
-
-Since the temporary directory already contains the process id, there is no need
-to put it into the filename as well.
-
-Index: ghc-7.10.1/compiler/main/SysTools.hs
-===================================================================
---- ghc-7.10.1.orig/compiler/main/SysTools.hs 2015-03-21 23:30:07.000000000 +0100
-+++ ghc-7.10.1/compiler/main/SysTools.hs 2015-05-24 10:45:40.537513384 +0200
-@@ -1072,8 +1072,7 @@
- newTempName :: DynFlags -> Suffix -> IO FilePath
- newTempName dflags extn
- = do d <- getTempDir dflags
-- x <- getProcessID
-- findTempName (d </> "ghc" ++ show x ++ "_")
-+ findTempName (d </> "ghc_")
- where
- findTempName :: FilePath -> IO FilePath
- findTempName prefix
-@@ -1088,8 +1087,7 @@
- newTempLibName :: DynFlags -> Suffix -> IO (FilePath, FilePath, String)
- newTempLibName dflags extn
- = do d <- getTempDir dflags
-- x <- getProcessID
-- findTempName d ("ghc" ++ show x ++ "_")
-+ findTempName d ("ghc_")
- where
- findTempName :: FilePath -> String -> IO (FilePath, FilePath, String)
- findTempName dir prefix
diff -rN -u old-ghc/patches/series new-ghc/patches/series
--- old-ghc/patches/series 2015-06-15 08:28:55.133671627 +0000
+++ new-ghc/patches/series 2015-06-15 08:28:55.161671623 +0000
@@ -5,4 +5,3 @@
ghc-7.8.4-3-aarch64.patch
PPC-relocations.patch
buildpath-abi-stability.patch
-reproducible-tmp-names
More information about the Pkg-haskell-commits
mailing list