[Pkg-haskell-commits] darcs: ghc: Remove code from debian/rules for building haddock separately. Lets see what goes wrong.
Joachim Breitner
mail at joachim-breitner.de
Tue May 12 13:25:48 UTC 2015
Mon May 11 21:18:05 UTC 2015 Joachim Breitner <mail at joachim-breitner.de>
* Remove code from debian/rules for building haddock separately. Lets see what goes wrong.
M ./changelog -1 +3
M ./rules -25 +1
Mon May 11 21:18:05 UTC 2015 Joachim Breitner <mail at joachim-breitner.de>
* Remove code from debian/rules for building haddock separately. Lets see what goes wrong.
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog 2015-05-12 13:25:47.864683004 +0000
+++ new-ghc/changelog 2015-05-12 13:25:47.888683003 +0000
@@ -2,8 +2,10 @@
* New upstream release. Optimistically dropping lots of patches, lets see
what now works out of the box.
+ * Remove code from debian/rules for building haddock separately. Lets see
+ what goes wrong.
- -- Joachim Breitner <nomeata at debian.org> Mon, 11 May 2015 22:23:21 +0200
+ -- Joachim Breitner <nomeata at debian.org> Mon, 11 May 2015 22:28:05 +0200
ghc (7.8.4-4) unstable; urgency=medium
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules 2015-05-12 13:25:47.864683004 +0000
+++ new-ghc/rules 2015-05-12 13:25:47.888683003 +0000
@@ -120,22 +120,6 @@
[ "$$(debian/testghc/foo)" = "Foo" ]
rm debian/testghc/*
-# build haddock separately and hard code paths according to install paths
- rm -rf debian/haddock-build
- mkdir -p debian/haddock-build
- cp -r utils/haddock debian/haddock-build
- cd debian/haddock-build/haddock; \
- rm -rf dist; \
- ../../../inplace/bin/ghc-stage2 --make Setup.lhs; \
- ./Setup configure --prefix=/usr --with-compiler=../../../inplace/bin/ghc-stage2 \
- --package-db=../../../inplace/lib/package.conf.d/ \
- --htmldir=/usr/share/doc/ghc-haddock/html/ \
- --datadir=/usr/share \
- --datasubdir=haddock \
- --libdir=/usr/lib \
- --libsubdir=haddock ; \
- ./Setup build
-
touch $@
FILES = \( -type f -o -type l \)
@@ -169,17 +153,10 @@
debian/provided_substvars
sed -ri 's,^haddock-interfaces: /.*?/libraries/,haddock-interfaces: /usr/lib/ghc-doc/haddock/ghc/,' debian/tmp/var/lib/ghc/package.conf.d/*.conf
- # Remove haddock as built within the ghc tree
- rm -f debian/tmp/usr/bin/haddock \
- debian/tmp/usr/bin/haddock-$(ProjectVersion) \
- debian/tmp/usr/lib/ghc/lib/haddock
- rm -rf debian/tmp/usr/lib/ghc/html
-
# Sort out the binaries
if inplace/bin/ghc-stage2 --info | grep '"Have interpreter","NO"'; then \
cd debian/tmp/usr/bin ;rm -f ghci* runghc* runhaskell*; \
fi
- cd debian/haddock-build/haddock; ./Setup copy --dest=../../tmp
# Check if we have a ghci binary
if test -e debian/tmp/usr/bin/ghci-$(ProjectVersion); then \
@@ -187,7 +164,7 @@
# Add haddock substvars
echo "haddock:Depends=haddock-interface-$$(debian/tmp/usr/bin/haddock --interface-version)" >> debian/ghc-doc.substvars
- echo "haddock:Provides=haddock-interface-$$(debian/tmp/usr/bin/haddock --interface-version)" >> debian/ghc-haddock.substvars
+ echo "haddock:Provides=haddock-interface-$$(debian/tmp/usr/bin/haddock --interface-version)" >> debian/ghc-haddock.substvars
ifeq (YES,$(BUILD_HADDOCK_DOCS))
mkdir -p debian/tmp/usr/lib/ghc-doc
@@ -268,7 +245,6 @@
rm -f mk/build.mk
rm -rf debian/testghc
rm -f ch01.html ch02.html index.html
- rm -rf debian/haddock-build
# Hacks:
rm -f config.log
More information about the Pkg-haskell-commits
mailing list