[Pkg-haskell-commits] darcs: ghc: Refresh patches, use --with-system-libffi
mail at joachim-breitner.de
mail at joachim-breitner.de
Wed Feb 5 10:49:39 UTC 2014
Tue Feb 4 23:23:04 UTC 2014 mail at joachim-breitner.de
* Refresh patches, use --with-system-libffi
M ./patches/ARM-VFPv3D16 -5 +5
R ./patches/Handle-sign-bit-when-generating-veneer-for-ARM-Thumb.patch
R ./patches/cabal-bug-1087.patch
M ./patches/haddock-hardcode-ghc-paths -21 +10
R ./patches/llvm-3.3-compat
M ./patches/no-missing-haddock-file-warning -4 +4
M ./patches/series -5 +1
R ./patches/system-libffi
M ./patches/use-debian-gen_contents_index -6 +6
M ./rules +1
Tue Feb 4 23:23:04 UTC 2014 mail at joachim-breitner.de
* Refresh patches, use --with-system-libffi
diff -rN -u old-ghc/patches/ARM-VFPv3D16 new-ghc/patches/ARM-VFPv3D16
--- old-ghc/patches/ARM-VFPv3D16 2014-02-05 10:49:39.825531235 +0000
+++ new-ghc/patches/ARM-VFPv3D16 2014-02-05 10:49:39.845531236 +0000
@@ -1,12 +1,12 @@
Description: Use VFPv3-D16 FPU for ARM builds
Author: Jani Monoses <jani at ubuntu.com>
-Index: ghc-7.6.1/aclocal.m4
+Index: ghc-7.9.20140130/aclocal.m4
===================================================================
---- ghc-7.6.1.orig/aclocal.m4 2012-09-04 19:10:14.000000000 +0200
-+++ ghc-7.6.1/aclocal.m4 2012-10-08 13:12:33.055874894 +0200
-@@ -349,7 +349,7 @@
- ],
+--- ghc-7.9.20140130.orig/aclocal.m4 2014-01-31 12:18:23.422195819 +0000
++++ ghc-7.9.20140130/aclocal.m4 2014-01-31 12:18:23.418195819 +0000
+@@ -408,7 +408,7 @@
+ )],
[changequote(, )dnl
ARM_ISA=ARMv7
- ARM_ISA_EXT="[VFPv3,NEON]"
diff -rN -u old-ghc/patches/cabal-bug-1087.patch new-ghc/patches/cabal-bug-1087.patch
--- old-ghc/patches/cabal-bug-1087.patch 2014-02-05 10:49:39.825531235 +0000
+++ new-ghc/patches/cabal-bug-1087.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-Description: Fix bug in preprocessing test suites and benchmarks
-
- Preprocessed files would be written to dist/build instead of
- dist/build/my-test-suite/my-test-suite-tmp, causing them not to be
- found during compilation.
-
- Fixes #1087.
-Author: Johan Tibell <johan.tibell at gmail.com>
-Origin: https://github.com/haskell/cabal/commit/dd691fa6791d67981388ec044b28343879d8c2b1
-diff --git a/libraries/Cabal/Cabal/Distribution/Simple/PreProcess.hs b/libraries/Cabal/Cabal/Distribution/Simple/PreProcess.hs
-index 0c6cb3e..ad9df9f 100644
---- a/libraries/Cabal/Cabal/Distribution/Simple/PreProcess.hs
-+++ b/libraries/Cabal/Cabal/Distribution/Simple/PreProcess.hs
-@@ -232,7 +232,7 @@ preprocessComponent pd comp lbi isSrcDist verbosity handlers = case comp of
- preProcessComponent bi modules exePath dir = do
- let biHandlers = localHandlers bi
- sourceDirs = hsSourceDirs bi ++ [ autogenModulesDir lbi ]
-- sequence_ [ preprocessFile sourceDirs (buildDir lbi) isSrcDist
-+ sequence_ [ preprocessFile sourceDirs dir isSrcDist
- (ModuleName.toFilePath modu) verbosity builtinSuffixes
- biHandlers
- | modu <- modules ]
diff -rN -u old-ghc/patches/haddock-hardcode-ghc-paths new-ghc/patches/haddock-hardcode-ghc-paths
--- old-ghc/patches/haddock-hardcode-ghc-paths 2014-02-05 10:49:39.825531235 +0000
+++ new-ghc/patches/haddock-hardcode-ghc-paths 2014-02-05 10:49:39.845531236 +0000
@@ -1,32 +1,21 @@
-Index: ghc-7.6.1.20121207/utils/haddock/haddock.cabal
+Index: ghc-7.9.20140130/utils/haddock/haddock.cabal
===================================================================
---- ghc-7.6.1.20121207.orig/utils/haddock/haddock.cabal 2012-12-11 23:38:48.259705093 +0100
-+++ ghc-7.6.1.20121207/utils/haddock/haddock.cabal 2012-12-11 23:38:54.615704866 +0100
-@@ -118,10 +118,6 @@
-
- library
- default-language: Haskell2010
-- -- In a GHC tree - in particular, in a source tarball - we don't
-- -- require alex or happy
-- if !flag(in-ghc-tree)
-- build-tools: alex >= 2.3, happy >= 1.18
- build-depends:
- base >= 4.3 && < 4.7,
- filepath,
-@@ -135,8 +131,6 @@
+--- ghc-7.9.20140130.orig/utils/haddock/haddock.cabal 2014-01-31 15:37:04.853698870 +0000
++++ ghc-7.9.20140130/utils/haddock/haddock.cabal 2014-01-31 15:37:04.853698870 +0000
+@@ -147,8 +147,6 @@
if flag(in-ghc-tree)
cpp-options: -DIN_GHC_TREE
- else
- build-depends: ghc-paths
- hs-source-dirs: src
+ hs-source-dirs: src, vendor/attoparsec-0.10.4.0
if flag(dev)
-Index: ghc-7.6.1.20121207/utils/haddock/src/Haddock.hs
+Index: ghc-7.9.20140130/utils/haddock/src/Haddock.hs
===================================================================
---- ghc-7.6.1.20121207.orig/utils/haddock/src/Haddock.hs 2012-12-11 23:38:45.183705205 +0100
-+++ ghc-7.6.1.20121207/utils/haddock/src/Haddock.hs 2012-12-11 23:38:54.615704866 +0100
-@@ -50,7 +50,6 @@
+--- ghc-7.9.20140130.orig/utils/haddock/src/Haddock.hs 2014-01-31 15:37:04.853698870 +0000
++++ ghc-7.9.20140130/utils/haddock/src/Haddock.hs 2014-01-31 15:37:04.853698870 +0000
+@@ -51,7 +51,6 @@
#ifdef IN_GHC_TREE
import System.FilePath
#else
@@ -34,7 +23,7 @@
import Paths_haddock
#endif
-@@ -349,14 +348,14 @@
+@@ -380,14 +379,14 @@
libDir <- getInTreeDir
return (ghcPath, libDir)
#else
diff -rN -u old-ghc/patches/Handle-sign-bit-when-generating-veneer-for-ARM-Thumb.patch new-ghc/patches/Handle-sign-bit-when-generating-veneer-for-ARM-Thumb.patch
--- old-ghc/patches/Handle-sign-bit-when-generating-veneer-for-ARM-Thumb.patch 2014-02-05 10:49:39.825531235 +0000
+++ new-ghc/patches/Handle-sign-bit-when-generating-veneer-for-ARM-Thumb.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-From c47c47a4afb3aea920a8006cd44ced5874664288 Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson at canonical.com>
-Date: Tue, 9 Apr 2013 00:02:27 +0100
-Subject: [PATCH] Handle sign bit when generating veneer for ARM Thumb branch
- relocation
-
----
- rts/Linker.c | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: ghc-7.6.3/rts/Linker.c
-===================================================================
---- ghc-7.6.3.orig/rts/Linker.c 2013-06-05 20:47:32.498881090 +0200
-+++ ghc-7.6.3/rts/Linker.c 2013-06-05 20:47:32.498881090 +0200
-@@ -4850,6 +4850,7 @@
- // Generate veneer
- SymbolExtra *extra = makeArmSymbolExtra(oc, ELF_R_SYM(info), S+imm+4, 1, is_target_thm);
- offset = (StgWord32) &extra->jumpIsland - P - 4;
-+ sign = offset >> 31;
- to_thm = 1;
- } else if (!is_target_thm && ELF_R_TYPE(info) == R_ARM_THM_CALL) {
- offset &= ~0x3;
diff -rN -u old-ghc/patches/llvm-3.3-compat new-ghc/patches/llvm-3.3-compat
--- old-ghc/patches/llvm-3.3-compat 2014-02-05 10:49:39.825531235 +0000
+++ new-ghc/patches/llvm-3.3-compat 1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-From: Geoffrey Mainland <gmainlan at microsoft.com>
-Date: Wed, 12 Jun 2013 13:31:49 +0000 (+0100)
-Subject: Avoid generating empty llvm.used definitions.
-X-Git-Url: http://git.haskell.org/ghc.git/commitdiff_plain/db9b63105a54
-
-Avoid generating empty llvm.used definitions.
-
-LLVM 3.3rc3 complains when the llvm.used global is an empty array, so don't
-define llvm.used at all when it would be empty.
----
-
-Index: ghc-7.6.3/compiler/llvmGen/LlvmCodeGen.hs
-===================================================================
---- ghc-7.6.3.orig/compiler/llvmGen/LlvmCodeGen.hs 2013-12-08 17:13:46.119975151 +0000
-+++ ghc-7.6.3/compiler/llvmGen/LlvmCodeGen.hs 2013-12-08 17:13:46.119975151 +0000
-@@ -112,19 +112,19 @@
- -> [[LlvmVar]] -- ^ info tables that need to be marked as 'used'
- -> IO ()
-
--cmmProcLlvmGens _ _ _ _ [] _ []
-- = return ()
--
- cmmProcLlvmGens dflags h _ _ [] _ ivars
-- = let ivars' = concat ivars
-- cast x = LMBitc (LMStaticPointer (pVarLift x)) i8Ptr
-- ty = (LMArray (length ivars') i8Ptr)
-- usedArray = LMStaticArray (map cast ivars') ty
-- lmUsed = (LMGlobalVar (fsLit "llvm.used") ty Appending
-- (Just $ fsLit "llvm.metadata") Nothing False, Just usedArray)
-- in Prt.bufLeftRender h $ {-# SCC "llvm_used_ppr" #-}
-- withPprStyleDoc dflags (mkCodeStyle CStyle) $
-- pprLlvmData ([lmUsed], [])
-+ | null ivars' = return ()
-+ | otherwise = Prt.bufLeftRender h $
-+ {-# SCC "llvm_used_ppr" #-}
-+ withPprStyleDoc dflags (mkCodeStyle CStyle) $
-+ pprLlvmData ([lmUsed], [])
-+ where
-+ ivars' = concat ivars
-+ cast x = LMBitc (LMStaticPointer (pVarLift x)) i8Ptr
-+ ty = (LMArray (length ivars') i8Ptr)
-+ usedArray = LMStaticArray (map cast ivars') ty
-+ lmUsed = (LMGlobalVar (fsLit "llvm.used") ty Appending
-+ (Just $ fsLit "llvm.metadata") Nothing False, Just usedArray)
-
- cmmProcLlvmGens dflags h us env ((CmmData _ _) : cmms) count ivars
- = cmmProcLlvmGens dflags h us env cmms count ivars
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 2014-02-05 10:49:39.825531235 +0000
+++ new-ghc/patches/no-missing-haddock-file-warning 2014-02-05 10:49:39.849531236 +0000
@@ -3,11 +3,11 @@
without the -doc package.
Author: Joachim Breitner <nomeata at debian.org>
-Index: ghc-7.6.1/utils/ghc-pkg/Main.hs
+Index: ghc-7.9.20140130/utils/ghc-pkg/Main.hs
===================================================================
---- ghc-7.6.1.orig/utils/ghc-pkg/Main.hs 2012-09-04 19:10:15.000000000 +0200
-+++ ghc-7.6.1/utils/ghc-pkg/Main.hs 2012-10-08 13:13:25.447872995 +0200
-@@ -1362,8 +1362,10 @@
+--- ghc-7.9.20140130.orig/utils/ghc-pkg/Main.hs 2014-01-31 12:18:37.474195233 +0000
++++ ghc-7.9.20140130/utils/ghc-pkg/Main.hs 2014-01-31 12:18:37.474195233 +0000
+@@ -1378,8 +1378,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/series new-ghc/patches/series
--- old-ghc/patches/series 2014-02-05 10:49:39.825531235 +0000
+++ new-ghc/patches/series 2014-02-05 10:49:39.857531236 +0000
@@ -1,8 +1,4 @@
-cabal-bug-1087.patch
-system-libffi
-haddock-hardcode-ghc-paths
use-debian-gen_contents_index
ARM-VFPv3D16
no-missing-haddock-file-warning
-Handle-sign-bit-when-generating-veneer-for-ARM-Thumb.patch
-llvm-3.3-compat
+haddock-hardcode-ghc-paths
diff -rN -u old-ghc/patches/system-libffi new-ghc/patches/system-libffi
--- old-ghc/patches/system-libffi 2014-02-05 10:49:39.825531235 +0000
+++ new-ghc/patches/system-libffi 1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-This patch could be replaced by a configure call if
-http://hackage.haskell.org/trac/ghc/ticket/5743 were fixed.
-
-Index: ghc-7.6.1/rts/package.conf.in
-===================================================================
---- ghc-7.6.1.orig/rts/package.conf.in 2012-09-04 19:10:15.000000000 +0200
-+++ ghc-7.6.1/rts/package.conf.in 2012-10-08 13:06:55.167887121 +0200
-@@ -24,8 +24,9 @@
- hs-libraries: "HSrts"
-
- extra-libraries:
-+ "ffi"
- #ifdef HAVE_LIBM
-- "m" /* for ldexp() */
-+ , "m" /* for ldexp() */
- #endif
- #ifdef HAVE_LIBRT
- , "rt"
-Index: ghc-7.6.1/ghc.mk
-===================================================================
---- ghc-7.6.1.orig/ghc.mk 2012-09-04 19:10:15.000000000 +0200
-+++ ghc-7.6.1/ghc.mk 2012-10-08 13:06:55.171887120 +0200
-@@ -600,7 +600,6 @@
- $(MAYBE_GHCI) \
- driver/ghc \
- driver/haddock \
-- libffi \
- includes \
- rts
-
-Index: ghc-7.6.1/rts/ghc.mk
-===================================================================
---- ghc-7.6.1.orig/rts/ghc.mk 2012-09-04 19:10:15.000000000 +0200
-+++ ghc-7.6.1/rts/ghc.mk 2012-10-08 13:08:52.019882891 +0200
-@@ -177,12 +177,12 @@
- # Making a shared library for the RTS.
- ifneq "$$(findstring dyn, $1)" ""
- ifeq "$$(HostOS_CPP)" "mingw32"
--$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend rts/dist/build/$$(LIBFFI_DLL)
-+$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend
- "$$(RM)" $$(RM_OPTS) $$@
- "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
- -no-auto-link-packages -Lrts/dist/build -l$(LIBFFI_WINDOWS_LIB) `cat rts/libs.depend` $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) -o $$@
- else
--$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend rts/dist/build/libffi$$(soext)
-+$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend
- "$$(RM)" $$(RM_OPTS) $$@
- "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
- -no-auto-link-packages -Lrts/dist/build -lffi `cat rts/libs.depend` $$(rts_$1_OBJS) \
-@@ -193,9 +193,9 @@
- endif
- endif
- else
--$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) $$(rts_ffi_objs_stamp)
-+$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS)
- "$$(RM)" $$(RM_OPTS) $$@
-- echo $$(rts_ffi_objs) $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR_STAGE1)" \
-+ echo $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR_STAGE1)" \
- $$(AR_OPTS_STAGE1) $$(EXTRA_AR_ARGS_STAGE1) $$@
- endif
-
-@@ -509,10 +509,8 @@
- # installing
-
- INSTALL_LIBS += $(ALL_RTS_LIBS)
--INSTALL_LIBS += $(wildcard rts/dist/build/libffi$(soext)*)
--INSTALL_LIBS += $(wildcard rts/dist/build/$(LIBFFI_DLL))
-
--install: install_libffi_headers
-+install:
-
- .PHONY: install_libffi_headers
- install_libffi_headers :
diff -rN -u old-ghc/patches/use-debian-gen_contents_index new-ghc/patches/use-debian-gen_contents_index
--- old-ghc/patches/use-debian-gen_contents_index 2014-02-05 10:49:39.825531235 +0000
+++ new-ghc/patches/use-debian-gen_contents_index 2014-02-05 10:49:39.849531236 +0000
@@ -1,11 +1,11 @@
-Index: ghc-7.6.3/ghc.mk
+Index: ghc-7.9.20140130/ghc.mk
===================================================================
---- ghc-7.6.3.orig/ghc.mk 2013-04-21 19:15:42.879976671 +0200
-+++ ghc-7.6.3/ghc.mk 2013-04-21 19:16:05.491975805 +0200
-@@ -701,7 +701,6 @@
+--- ghc-7.9.20140130.orig/ghc.mk 2014-01-31 12:18:02.170196705 +0000
++++ ghc-7.9.20140130/ghc.mk 2014-01-31 12:18:17.654196059 +0000
+@@ -755,7 +755,6 @@
# Build the Haddock contents and index
ifeq "$(HADDOCK_DOCS)" "YES"
- libraries/dist-haddock/index.html: inplace/bin/haddock$(exeext) $(ALL_HADDOCK_FILES)
+ libraries/dist-haddock/index.html: $(haddock_INPLACE) $(ALL_HADDOCK_FILES)
- cd libraries && sh gen_contents_index --intree
ifeq "$(phase)" "final"
$(eval $(call all-target,library_doc_index,libraries/dist-haddock/index.html))
@@ -24,7 +24,7 @@
endif
ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
for i in $(INSTALL_HTML_DOC_DIRS); do \
-@@ -980,7 +975,6 @@
+@@ -981,7 +976,6 @@
mk/project.mk \
mk/install.mk.in \
bindist.mk \
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules 2014-02-05 10:49:39.825531235 +0000
+++ new-ghc/rules 2014-02-05 10:49:39.857531236 +0000
@@ -107,6 +107,7 @@
ln -s /usr/share/misc/config.guess .
./configure $(confflags) --prefix=/usr \
$(EXTRA_CONFIGURE_FLAGS) \
+ --with-system-libffi \
--with-ld=ld.bfd \
--with-llc=llc \
--with-opt=opt
More information about the Pkg-haskell-commits
mailing list