Context Navigation

Ticket #1876: ghc-6.11-ghc-pkg-install-inplace.patch

File ghc-6.11-ghc-pkg-install-inplace.patch, 1.2 KB (added by juhpetersen, 3 years ago)
Use dist-inplace ghc-pkg for dist package.conf and cabal'ing

diff -up ghc-6.11.20090421/mk/cabal-flags.mk~ ghc-6.11.20090421/mk/cabal-flags.mk

old	new
3	3	space=$(nothing) $(nothing)
4	4	comma=,
5	5
6		GHC_PKG_INSTALL_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/dist-in~~stall~~/build/ghc-pkg/ghc-pkg
	6	GHC_PKG_INSTALL_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/dist-inplace/build/ghc-pkg/ghc-pkg
7	7
8	8	LIBRARIES_ABS = $(FPTOOLS_TOP_ABS)/libraries
9	9	UTILS_ABS = $(FPTOOLS_TOP_ABS)/utils

diff -up ghc-6.11.20090421/mk/package.mk~ ghc-6.11.20090421/mk/package.mk

old	new
86	86	\| sed -e 's/""//g' -e 's/:[ ]*,/: /g' \
87	87	\| $(GHC_PKG_INSTALL_PROG) --global-conf $(DESTDIR)$(datadir)/package.conf update - --force
88	88
89		GHC_PKG_INSTALL_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/dist-in~~stall~~/build/ghc-pkg/ghc-pkg
	89	GHC_PKG_INSTALL_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/dist-inplace/build/ghc-pkg/ghc-pkg
90	90
91	91	# we could be more accurate here and add a dependency on
92	92	# driver/package.conf, but that doesn't work too well because of