[DHG_packages] 02/04: ghc: refresh patches
Sean Whitton
spwhitton at spwhitton.name
Sat Sep 16 16:25:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
spwhitton pushed a commit to branch experimental
in repository DHG_packages.
commit c23ec5189660d1045a2023a7e260d24586298fbd
Author: Sean Whitton <spwhitton at spwhitton.name>
Date: Sat Sep 16 08:46:18 2017 -0700
ghc: refresh patches
---
p/ghc/debian/changelog | 3 ++-
p/ghc/debian/patches/ARM-VFPv3D16 | 8 +++-----
p/ghc/debian/patches/buildpath-abi-stability.patch | 4 ++--
p/ghc/debian/patches/do-not-use-SHELL | 12 ++++++------
p/ghc/debian/patches/hurd.diff | 8 ++++----
p/ghc/debian/patches/no-missing-haddock-file-warning | 8 +++-----
p/ghc/debian/patches/reproducible-tmp-names | 6 +++---
p/ghc/debian/patches/use-debian-gen_contents_index | 12 +++++-------
8 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index fb2717c..ac02e65 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,8 +1,9 @@
ghc (8.2.1-2) UNRELEASED; urgency=medium
* Upload to experimental again, after merging in changes from unstable.
+ - Refresh patches.
- -- Sean Whitton <spwhitton at spwhitton.name> Sat, 16 Sep 2017 08:45:08 -0700
+ -- Sean Whitton <spwhitton at spwhitton.name> Sat, 16 Sep 2017 08:46:12 -0700
ghc (8.2.1-1) experimental; urgency=medium
diff --git a/p/ghc/debian/patches/ARM-VFPv3D16 b/p/ghc/debian/patches/ARM-VFPv3D16
index 379b74c..28d477a 100644
--- a/p/ghc/debian/patches/ARM-VFPv3D16
+++ b/p/ghc/debian/patches/ARM-VFPv3D16
@@ -6,11 +6,9 @@ Author: Jani Monoses <jani at ubuntu.com>
Upstream-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
Launchpad-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
-Index: ghc/aclocal.m4
-===================================================================
---- ghc.orig/aclocal.m4 2016-01-14 16:19:24.858462215 +0100
-+++ ghc/aclocal.m4 2016-01-14 16:19:24.854462134 +0100
-@@ -420,7 +420,7 @@
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -418,7 +418,7 @@ AC_DEFUN([GET_ARM_ISA],
)],
[changequote(, )dnl
ARM_ISA=ARMv7
diff --git a/p/ghc/debian/patches/buildpath-abi-stability.patch b/p/ghc/debian/patches/buildpath-abi-stability.patch
index c981fcc..1d45c72 100644
--- a/p/ghc/debian/patches/buildpath-abi-stability.patch
+++ b/p/ghc/debian/patches/buildpath-abi-stability.patch
@@ -2,7 +2,7 @@ Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
--- a/compiler/iface/MkIface.hs
+++ b/compiler/iface/MkIface.hs
-@@ -682,7 +682,7 @@
+@@ -681,7 +681,7 @@ addFingerprints hsc_env mb_old_fingerpri
iface_hash <- computeFingerprint putNameLiterally
(mod_hash,
ann_fn (mkVarOcc "module"), -- See mkIfaceAnnCache
@@ -11,7 +11,7 @@ Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
sorted_deps,
mi_hpc iface0)
-@@ -715,6 +715,9 @@
+@@ -714,6 +714,9 @@ addFingerprints hsc_env mb_old_fingerpri
(non_orph_fis, orph_fis) = mkOrphMap ifFamInstOrph (mi_fam_insts iface0)
fix_fn = mi_fix_fn iface0
ann_fn = mkIfaceAnnCache (mi_anns iface0)
diff --git a/p/ghc/debian/patches/do-not-use-SHELL b/p/ghc/debian/patches/do-not-use-SHELL
index 939976b..b8b2548 100644
--- a/p/ghc/debian/patches/do-not-use-SHELL
+++ b/p/ghc/debian/patches/do-not-use-SHELL
@@ -5,7 +5,7 @@ Author: Joachim Breitner <nomeata at debian.org>
--- a/driver/ghci/ghc.mk
+++ b/driver/ghci/ghc.mk
-@@ -21,7 +21,7 @@
+@@ -21,7 +21,7 @@ install_driver_ghci:
$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
$(call removeFiles, "$(WRAPPER)")
$(CREATE_SCRIPT) "$(WRAPPER)"
@@ -14,7 +14,7 @@ Author: Joachim Breitner <nomeata at debian.org>
echo 'exec "$(bindir)/ghc-$(ProjectVersion)" --interactive "$$@"' >> "$(WRAPPER)"
$(EXECUTABLE_FILE) "$(WRAPPER)"
$(call removeFiles,"$(DESTDIR)$(bindir)/ghci")
-@@ -56,7 +56,7 @@
+@@ -56,7 +56,7 @@ install_driver_ghcii: GHCII_SCRIPT_VERSI
install_driver_ghcii:
$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
$(call removeFiles,"$(GHCII_SCRIPT)")
@@ -25,7 +25,7 @@ Author: Joachim Breitner <nomeata at debian.org>
cp $(GHCII_SCRIPT) $(GHCII_SCRIPT_VERSIONED)
--- a/rules/shell-wrapper.mk
+++ b/rules/shell-wrapper.mk
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ $$($1_$2_INPLACE_WRAPPER): $$($1_$2_SHEL
endif
$$($1_$2_INPLACE_WRAPPER): $$($1_$2_INPLACE)
$$(call removeFiles, $$@)
@@ -34,7 +34,7 @@ Author: Joachim Breitner <nomeata at debian.org>
echo 'executablename="$$(TOP)/$$<"' >> $$@
echo 'datadir="$$(TOP)/$$(INPLACE_LIB)"' >> $$@
echo 'bindir="$$(TOP)/$$(INPLACE_BIN)"' >> $$@
-@@ -80,7 +80,7 @@
+@@ -80,7 +80,7 @@ install_$1_$2_wrapper:
$$(INSTALL_DIR) "$$(DESTDIR)$$(bindir)"
$$(call removeFiles, "$$(WRAPPER)")
$$(CREATE_SCRIPT) "$$(WRAPPER)"
@@ -43,7 +43,7 @@ Author: Joachim Breitner <nomeata at debian.org>
echo 'exedir="$$(ghclibexecdir)/bin"' >> "$$(WRAPPER)"
echo 'exeprog="$$($1_$2_PROG)"' >> "$$(WRAPPER)"
echo 'executablename="$$$$exedir/$$$$exeprog"' >> "$$(WRAPPER)"
-@@ -106,7 +106,7 @@
+@@ -106,7 +106,7 @@ BINDIST_EXTRAS += $$($1_$2_BINDIST_WRAPP
$$($1_$2_BINDIST_WRAPPER): $1/$2/build/tmp/$$($1_$2_PROG)
$$(call removeFiles, $$@)
@@ -54,7 +54,7 @@ Author: Joachim Breitner <nomeata at debian.org>
endif
--- a/utils/mkdirhier/ghc.mk
+++ b/utils/mkdirhier/ghc.mk
-@@ -14,7 +14,7 @@
+@@ -14,7 +14,7 @@ $(MKDIRHIER) : utils/mkdirhier/mkdirhier
mkdir -p $(INPLACE_BIN)
mkdir -p $(INPLACE_LIB)
$(call removeFiles,$@)
diff --git a/p/ghc/debian/patches/hurd.diff b/p/ghc/debian/patches/hurd.diff
index 20986c9..c53e284 100644
--- a/p/ghc/debian/patches/hurd.diff
+++ b/p/ghc/debian/patches/hurd.diff
@@ -2,7 +2,7 @@ Provided by “Pino” via Samuel Thibault. Not yet pushed upstream.
--- a/aclocal.m4
+++ b/aclocal.m4
-@@ -275,7 +275,7 @@
+@@ -275,7 +275,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_V
nto-qnx)
test -z "[$]2" || eval "[$]2=OSQNXNTO"
;;
@@ -11,7 +11,7 @@ Provided by “Pino” via Samuel Thibault. Not yet pushed upstream.
test -z "[$]2" || eval "[$]2=OSUnknown"
;;
aix)
-@@ -284,6 +284,9 @@
+@@ -284,6 +284,9 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_V
linux-android)
test -z "[$]2" || eval "[$]2=OSAndroid"
;;
@@ -23,7 +23,7 @@ Provided by “Pino” via Samuel Thibault. Not yet pushed upstream.
exit 1
--- a/compiler/utils/Platform.hs
+++ b/compiler/utils/Platform.hs
-@@ -88,6 +88,7 @@
+@@ -88,6 +88,7 @@ data OS
| OSQNXNTO
| OSAndroid
| OSAIX
@@ -31,7 +31,7 @@ Provided by “Pino” via Samuel Thibault. Not yet pushed upstream.
deriving (Read, Show, Eq)
-- | ARM Instruction Set Architecture, Extensions and ABI
-@@ -139,6 +140,7 @@
+@@ -139,6 +140,7 @@ osElfTarget OSHaiku = True
osElfTarget OSQNXNTO = False
osElfTarget OSAndroid = True
osElfTarget OSAIX = False
diff --git a/p/ghc/debian/patches/no-missing-haddock-file-warning b/p/ghc/debian/patches/no-missing-haddock-file-warning
index eac921e..75fd11d 100644
--- a/p/ghc/debian/patches/no-missing-haddock-file-warning
+++ b/p/ghc/debian/patches/no-missing-haddock-file-warning
@@ -3,11 +3,9 @@ Description: Do not emit a warning if the .haddock file is missing
without the -doc package.
Author: Joachim Breitner <nomeata at debian.org>
-Index: ghc-8.0.2/utils/ghc-pkg/Main.hs
-===================================================================
---- ghc-8.0.2.orig/utils/ghc-pkg/Main.hs
-+++ ghc-8.0.2/utils/ghc-pkg/Main.hs
-@@ -1588,8 +1588,10 @@
+--- a/utils/ghc-pkg/Main.hs
++++ b/utils/ghc-pkg/Main.hs
+@@ -1773,8 +1773,10 @@ checkPackageConfig pkg verbosity db_stac
mapM_ (checkDir True "dynamic-library-dirs") (libraryDynDirs pkg)
mapM_ (checkDir True "include-dirs") (includeDirs pkg)
mapM_ (checkDir True "framework-dirs") (frameworkDirs pkg)
diff --git a/p/ghc/debian/patches/reproducible-tmp-names b/p/ghc/debian/patches/reproducible-tmp-names
index d4179cf..e8662a8 100644
--- a/p/ghc/debian/patches/reproducible-tmp-names
+++ b/p/ghc/debian/patches/reproducible-tmp-names
@@ -6,7 +6,7 @@ and assume that is going to be unique.
--- a/compiler/main/SysTools.hs
+++ b/compiler/main/SysTools.hs
-@@ -65,6 +65,7 @@
+@@ -65,6 +65,7 @@ import Platform
import Util
import DynFlags
import Exception
@@ -14,7 +14,7 @@ and assume that is going to be unique.
import LlvmCodeGen.Base (llvmVersionStr, supportedLlvmVersion)
-@@ -1118,8 +1119,8 @@
+@@ -1118,8 +1119,8 @@ getTempDir dflags = do
mapping <- readIORef dir_ref
case Map.lookup tmp_dir mapping of
Nothing -> do
@@ -25,7 +25,7 @@ and assume that is going to be unique.
mask_ $ mkTempDir prefix
Just dir -> return dir
where
-@@ -1546,6 +1547,13 @@
+@@ -1546,6 +1547,13 @@ getProcessID :: IO Int
getProcessID = System.Posix.Internals.c_getpid >>= return . fromIntegral
#endif
diff --git a/p/ghc/debian/patches/use-debian-gen_contents_index b/p/ghc/debian/patches/use-debian-gen_contents_index
index 31378a1..c4c8143 100644
--- a/p/ghc/debian/patches/use-debian-gen_contents_index
+++ b/p/ghc/debian/patches/use-debian-gen_contents_index
@@ -1,8 +1,6 @@
-Index: ghc/ghc.mk
-===================================================================
---- ghc.orig/ghc.mk 2016-05-21 17:05:28.794690704 +0200
-+++ ghc/ghc.mk 2016-05-21 17:05:28.790690606 +0200
-@@ -824,7 +824,6 @@
+--- a/ghc.mk
++++ b/ghc.mk
+@@ -829,7 +829,6 @@ endif
# Build the Haddock contents and index
ifeq "$(HADDOCK_DOCS)" "YES"
libraries/dist-haddock/index.html: $(haddock_INPLACE) $(ALL_HADDOCK_FILES)
@@ -10,7 +8,7 @@ Index: ghc/ghc.mk
ifeq "$(phase)" "final"
$(eval $(call all-target,library_doc_index,libraries/dist-haddock/index.html))
endif
-@@ -945,12 +944,8 @@
+@@ -950,12 +949,8 @@ endif
$(INSTALL_DIR) "$(DESTDIR)$(docdir)/html"
$(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html "$(DESTDIR)$(docdir)/html"
ifneq "$(INSTALL_LIBRARY_DOCS)" ""
@@ -24,7 +22,7 @@ Index: ghc/ghc.mk
endif
ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
for i in $(INSTALL_HTML_DOC_DIRS); do \
-@@ -1059,7 +1054,6 @@
+@@ -1067,7 +1062,6 @@ $(eval $(call bindist-list,.,\
mk/project.mk \
mk/install.mk.in \
bindist.mk \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git
More information about the Pkg-haskell-commits
mailing list