* The previous fix was wrong. Apply a proper fix and cross the fingers. :-)
+ On configure, compile 'Setup.hs' to 'setup' and use 'setup' as the build command instead of 'runhaskell', which, on some platforms (such as s390, alpha, m68k), throws the following error: runhaskell Setup.hs configure --prefix=/usr ghc-6.6.1: not built for interactive use This causes a serious FTBFS bug. Closes: #440668 (from Debian BTS). + Setup.hs: revert changes. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1005 788f1e2b-df1e-0410-8736-df70ead52e1b
This commit is contained in:
parent
b13e696c93
commit
1142c88727
3 changed files with 6 additions and 5 deletions
5
Makefile
5
Makefile
|
@ -9,7 +9,7 @@ MANDIR := man
|
|||
TESTDIR := tests
|
||||
BUILDDIR := dist
|
||||
BUILDCONF := .setup-config
|
||||
BUILDCMD := ./Setup.hs
|
||||
BUILDCMD := ./setup
|
||||
BUILDVARS := vars
|
||||
CONFIGURE := configure
|
||||
|
||||
|
@ -118,9 +118,10 @@ $(WRAPPERS): %: $(SRCDIR)/wrappers/%.in $(SRCDIR)/wrappers/*.sh
|
|||
@$(generate-shell-script)
|
||||
|
||||
.PHONY: configure
|
||||
cleanup_files+=$(BUILDDIR) $(BUILDCONF) $(BUILDVARS)
|
||||
cleanup_files+=Setup.hi Setup.o $(BUILDCMD) $(BUILDDIR) $(BUILDCONF) $(BUILDVARS)
|
||||
configure: $(BUILDCONF) templates
|
||||
$(BUILDCONF): $(CABAL)
|
||||
ghc -package Cabal Setup.hs -o $(BUILDCMD)
|
||||
$(BUILDCMD) configure --prefix=$(PREFIX)
|
||||
# Make configuration time settings persistent (definitely a hack).
|
||||
@echo "PREFIX?=$(PREFIX)" >$(BUILDVARS)
|
||||
|
|
1
Setup.hs
Executable file → Normal file
1
Setup.hs
Executable file → Normal file
|
@ -1,3 +1,2 @@
|
|||
#!/usr/bin/env runhaskell
|
||||
import Distribution.Simple
|
||||
main = defaultMain
|
||||
|
|
5
debian/changelog
vendored
5
debian/changelog
vendored
|
@ -2,8 +2,9 @@ pandoc (0.44) unstable; urgency=low
|
|||
|
||||
[ Recai Oktaş ]
|
||||
|
||||
* Use ./Setup.hs instead of runhaskell, which, on some platforms (such as
|
||||
s390, alpha, m68k), throws the following error:
|
||||
* On configure, compile 'Setup.hs' to 'setup' and use 'setup' as the build
|
||||
command instead of 'runhaskell', which, on some platforms (such as s390,
|
||||
alpha, m68k), throws the following error:
|
||||
|
||||
runhaskell Setup.hs configure --prefix=/usr
|
||||
ghc-6.6.1: not built for interactive use
|
||||
|
|
Loading…
Reference in a new issue