[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.10.1+dfsg1-2.dsc
Kari Pahula
kaol at debian.org
Sat Jan 15 06:05:56 UTC 2011
Wed Jan 21 21:33:11 UTC 2009 Kari Pahula <kaol at debian.org>
* Import of ghc6_6.10.1+dfsg1-2.dsc
M ./changelog +11
M ./control -1 +1
R ./ghc6-doc.triggers
A ./patches/ld-relax-ia64-fix
A ./patches/no-ld-relax-ia64
M ./patches/series +2
A ./patches/use-system-haddock
M ./rules -7 +15
Wed Jan 21 21:33:11 UTC 2009 Kari Pahula <kaol at debian.org>
* Import of ghc6_6.10.1+dfsg1-2.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog 2011-01-15 06:05:55.791714667 +0000
+++ new-ghc/changelog 2011-01-15 06:05:56.071729418 +0000
@@ -1,3 +1,14 @@
+ghc6 (6.10.1+dfsg1-2) experimental; urgency=low
+
+ * Patched the build system to use haddock from /usr/bin/, not build its
+ own.
+ * Disabled building haddock docs for this version.
+ * Re-enabled some of 6.8.2's build options for non-i386, non-amd64.
+ * Patch compiler/Makefile's ia64 build options;
+ s/--ld-option=-Wl,--relax/--ld-option=--relax/.
+
+ -- Kari Pahula <kaol at debian.org> Wed, 21 Jan 2009 23:33:11 +0200
+
ghc6 (6.10.1+dfsg1-1) experimental; urgency=low
* New upstream release (Closes: #495126)
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control 2011-01-15 06:05:55.791714667 +0000
+++ new-ghc/control 2011-01-15 06:05:56.071729418 +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, haddock (>= 2.4.1), hscolour, 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
Homepage: http://haskell.org/
Package: ghc6
diff -rN -u old-ghc/ghc6-doc.triggers new-ghc/ghc6-doc.triggers
--- old-ghc/ghc6-doc.triggers 2011-01-15 06:05:55.791714667 +0000
+++ new-ghc/ghc6-doc.triggers 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-interest /usr/share/doc/ghc6-doc/libraries
diff -rN -u old-ghc/patches/ld-relax-ia64-fix new-ghc/patches/ld-relax-ia64-fix
--- old-ghc/patches/ld-relax-ia64-fix 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/ld-relax-ia64-fix 2011-01-15 06:05:56.071729418 +0000
@@ -0,0 +1,13 @@
+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
+ endif
+
diff -rN -u old-ghc/patches/no-ld-relax-ia64 new-ghc/patches/no-ld-relax-ia64
--- old-ghc/patches/no-ld-relax-ia64 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/no-ld-relax-ia64 2011-01-15 06:05:56.015726468 +0000
@@ -0,0 +1,18 @@
+Index: ghc6-6.10.1+dfsg1/compiler/Makefile
+===================================================================
+--- ghc6-6.10.1+dfsg1.orig/compiler/Makefile 2009-01-21 15:31:53.000000000 +0200
++++ ghc6-6.10.1+dfsg1/compiler/Makefile 2009-01-21 15:32:54.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/series new-ghc/patches/series
--- old-ghc/patches/series 2011-01-15 06:05:55.791714667 +0000
+++ new-ghc/patches/series 2011-01-15 06:05:56.051728364 +0000
@@ -1,3 +1,5 @@
system-libffi
gen_contents_index-trac2764
tuple3-trac2750
+use-system-haddock
+ld-relax-ia64-fix
diff -rN -u old-ghc/patches/use-system-haddock new-ghc/patches/use-system-haddock
--- old-ghc/patches/use-system-haddock 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/use-system-haddock 2011-01-15 06:05:56.011726257 +0000
@@ -0,0 +1,60 @@
+Index: ghc6-6.10.1+dfsg1/compiler/Makefile
+===================================================================
+--- ghc6-6.10.1+dfsg1.orig/compiler/Makefile 2009-01-20 19:34:22.000000000 +0200
++++ ghc6-6.10.1+dfsg1/compiler/Makefile 2009-01-20 19:34:44.000000000 +0200
+@@ -213,7 +213,7 @@
+ doc.stage.%:
+ $(CABAL) haddock --distpref dist-stage$* \
+ --haddock-option=--optghc=-DSTAGE=$* \
+- --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock
++ --with-haddock=/usr/bin/haddock
+
+ install:
+ $(INSTALL_PACKAGE) install '$(GHC_PKG_INSTALL_PROG)' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' --distpref dist-stage2
+Index: ghc6-6.10.1+dfsg1/libraries/Makefile
+===================================================================
+--- ghc6-6.10.1+dfsg1.orig/libraries/Makefile 2009-01-20 19:34:22.000000000 +0200
++++ ghc6-6.10.1+dfsg1/libraries/Makefile 2009-01-20 20:20:19.000000000 +0200
+@@ -259,7 +259,7 @@
+ ifneq "$(HSCOLOUR)" ""
+ CABAL_HADDOCK_FLAGS += --hyperlink-source
+ endif
+-CABAL_HADDOCK_FLAGS += --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock
++CABAL_HADDOCK_FLAGS += --with-haddock=/usr/bin/haddock
+
+ $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR)):\
+ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
+Index: ghc6-6.10.1+dfsg1/utils/Makefile
+===================================================================
+--- ghc6-6.10.1+dfsg1.orig/utils/Makefile 2009-01-20 19:34:22.000000000 +0200
++++ ghc6-6.10.1+dfsg1/utils/Makefile 2009-01-20 19:34:44.000000000 +0200
+@@ -61,7 +61,7 @@
+
+ WITH_BOOTSTRAPPING_COMPILER = installPackage ghc-pkg hsc2hs hpc
+
+-WITH_STAGE2 = installPackage ghc-pkg hasktags runghc hpc pwd haddock
++WITH_STAGE2 = installPackage ghc-pkg hasktags runghc hpc pwd
+ ifneq "$(NO_INSTALL_HSC2HS)" "YES"
+ WITH_STAGE2 += hsc2hs
+ endif
+@@ -90,7 +90,6 @@
+ $(foreach P,$(WITH_BOOTSTRAPPING_COMPILER),with-bootstrapping-compiler.$P)
+
+ with-stage-2: $(foreach P,$(WITH_STAGE2),with-stage-2.$P)
+- $(MAKE) -C haddock install-inplace
+
+ install:: $(foreach P,$(filter-out $(DO_NOT_INSTALL),$(WITH_STAGE2)),install.$P)
+
+Index: ghc6-6.10.1+dfsg1/libraries/gen_contents_index
+===================================================================
+--- ghc6-6.10.1+dfsg1.orig/libraries/gen_contents_index 2009-01-20 20:15:40.000000000 +0200
++++ ghc6-6.10.1+dfsg1/libraries/gen_contents_index 2009-01-20 20:20:00.000000000 +0200
+@@ -29,7 +29,7 @@
+ done
+
+ # Now create the combined contents and index pages
+-$HADDOCK --gen-index --gen-contents -o . \
++/usr/bin/haddock --gen-index --gen-contents -o . \
+ -t "Haskell Hierarchical Libraries" \
+ -p "prologue.txt" \
+ $HADDOCK_ARGS
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules 2011-01-15 06:05:55.791714667 +0000
+++ new-ghc/rules 2011-01-15 06:05:56.071729418 +0000
@@ -23,6 +23,8 @@
GHC=$(firstword $(shell bash -c "type -p ghc6 ghc"))
EXTRA_CONFIGURE_FLAGS=--with-ghc="$(GHC)"
+# "YES" if yes
+BUILD_HADDOCK_DOCS=NO
configure: configure-stamp
configure-stamp: patch
@@ -32,19 +34,19 @@
rm -f mk/build.mk
echo "XMLDocWays := html" >> mk/build.mk
- echo "HADDOCK_DOCS := YES" >> mk/build.mk
+ 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
+ echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
+ echo "GhcWithInterpreter=NO" >> mk/build.mk
+ echo "SplitObjs=NO" >> mk/build.mk
# Let's see if we could do without this with 6.10.1.
-#ifeq '$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), i386 amd64)' ''
-# echo "GhcUnregisterised=YES" >> mk/build.mk
-# echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
-# echo "GhcWithInterpreter=NO" >> mk/build.mk
-# echo "SplitObjs=NO" >> mk/build.mk
# # The threaded RTS doesn't seem happy on non-x86/amd64
# echo 'GhcRTSWays := $$(shell echo $$(GhcRTSWays) | sed "s/\<[a-z_]*thr[a-z_]*\>//g")' >> mk/build.mk
# echo "GhcNotThreaded=YES" >> mk/build.mk
-#endif
+endif
ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
echo "SRC_HC_OPTS += -H32m -O0" >> mk/build.mk
echo "GhcHcOpts += -Rghc-timing -DDEBUG" >> mk/build.mk
@@ -154,8 +156,10 @@
rm -f debian/tmp/usr/bin/runhaskell6
# gen_contents_index is a script, so move it into /usr/lib
mkdir debian/tmp/usr/lib/ghc6-doc
+ifeq ($(BUILD_HADDOCK_DOCS),YES)
mv debian/tmp/usr/share/doc/ghc6-doc/libraries/gen_contents_index \
debian/tmp/usr/lib/ghc6-doc
+endif
# manpages
ProjectVersion=$(ProjectVersion) $(MAKE) -f debian/scripts.mk all
@@ -219,6 +223,7 @@
rm -f config.log
rm -f libraries/ghc-prim/GHC/PrimopWrappers.hs
rm -f libraries/ghc-prim/GHC/Prim.hs
+ rm -f libraries/frames.html libraries/index-frames.html
rm -rf .pc
@@ -228,6 +233,9 @@
binary-common-stamp: install-stamp
dh_testdir
dh_testroot
+ifeq ($(BUILD_HADDOCK_DOCS),YES)
+ echo "interest /usr/share/doc/ghc6-doc/libraries" > debian/ghc6-doc/DEBIAN/triggers
+endif
dh_installchangelogs
dh_installdocs
dh_installexamples
More information about the Pkg-haskell-commits
mailing list