drop unversioned htmldir patch

remove two old patches
2015-01-18 22:51:39 +09:00 · 2015-01-18 22:51:39 +09:00 · 1cb2f64c61
parent 3cca06965a
commit 1cb2f64c61
4 changed files with 1 additions and 116 deletions
--- a/Cabal-fix-dynamic-exec-for-TH.patch
+++ b/Cabal-fix-dynamic-exec-for-TH.patch
@ -1,23 +0,0 @@
--- ghc-7.6.3/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs~	2013-04-19 06:32:04.000000000 +0900
-+++ ghc-7.6.3/libraries/Cabal/Cabal/Distribution/Simple/GHC.hs	2013-06-12 11:35:39.832840754 +0900
-@@ -837,6 +837,8 @@
- 
-       dynamicOpts = vanillaOpts `mappend` mempty {
-                       ghcOptDynamic        = toFlag True,
-+                      ghcOptHiSuffix       = toFlag "dyn_hi",
-+                      ghcOptObjSuffix      = toFlag "dyn_o",
-                       ghcOptExtra          = ghcSharedOptions exeBi
-                     }
- 
-@@ -855,9 +857,9 @@
-   -- with profiling. This is because the code that TH needs to
-   -- run at compile time needs to be the vanilla ABI so it can
-   -- be loaded up and run by the compiler.
-  when (withProfExe lbi &&
-+  when ((withProfExe lbi || withDynExe lbi) &&
-         EnableExtension TemplateHaskell `elem` allExtensions exeBi) $
-    runGhcProg exeProfOpts { ghcOptNoLink = toFlag True }
-+    runGhcProg vanillaOpts { ghcOptNoLink = toFlag True }
- 
-   runGhcProg exeOpts { ghcOptOutputFile = toFlag (targetDir </> exeNameReal) }
- 
--- a/ghc-cabal-unversion-docdir.patch
+++ b/ghc-cabal-unversion-docdir.patch
@ -1,13 +0,0 @@
--- ghc-7.8/utils/ghc-cabal/Main.hs~	2013-08-28 08:06:37.000000000 +0900
-+++ ghc-7.8/utils/ghc-cabal/Main.hs	2013-09-03 17:51:22.800653817 +0900
-@@ -251,8 +251,8 @@
-           libsubdir = toPathTemplate "$pkgid",
-           docdir    = toPathTemplate $
-                           if relocatableBuild
-                          then "$topdir/../doc/html/libraries/$pkgid"
-                          else (myDocdir </> "$pkgid"),
-+                          then "$topdir/../doc/html/libraries/$pkg"
-+                          else (myDocdir </> "$pkg"),
-           htmldir   = toPathTemplate "$docdir"
-       }
- 
--- a/ghc-use-system-libffi.patch
+++ b/ghc-use-system-libffi.patch
@ -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 :
--- a/ghc.spec
+++ b/ghc.spec
@ -43,8 +43,6 @@ Source4: ghc-doc-index
 Patch1:  ghc-gen_contents_index-haddock-path.patch
 # add libffi include dir to ghc wrapper for archs using gcc/llc
 #Patch10: ghc-wrapper-libffi-include.patch
-# unversion library html docdirs
-Patch16: ghc-cabal-unversion-docdir.patch
 # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
 Patch20: ghc-glibc-2.20_BSD_SOURCE.patch
 # Debian patch
@ -263,11 +261,6 @@ rm -r libffi-tarballs
 #%%patch10 -p1 -b .10-ffi
 %endif

-# unversion pkgdoc htmldir
-%if 0%{?fedora} >= 21
-%patch16 -p1 -b .orig
-%endif
-
 %patch20 -p1 -b .orig

 %ifarch aarch64
@ -548,6 +541,7 @@ fi
 %changelog
 * Sun Jan 18 2015 Jens Petersen <petersen@redhat.com> - 7.8.4-40
 - production build
+- version doc htmldirs again

 * Sat Jan 17 2015 Jens Petersen <petersen@redhat.com> - 7.8.4-39
 - update to 7.8.4