cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Workaround for failing test case process007: use bash (yuck!)

Browse Source
This commit is contained in:
kili 2011-09-16 21:17:41 +00:00
parent e1c9a42a9b
commit a522a3d346
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lang/ghc/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.58 2011/08/24 18:31:39 kili Exp $
# $OpenBSD: Makefile,v 1.59 2011/09/16 21:17:41 kili Exp $
COMMENT-main = compiler for the functional language Haskell
COMMENT-doc = documentation for GHC
@ -91,7 +91,8 @@ PORTHOME = ${WRKDIR}
BUILD_DEPENDS += devel/haddock,no_deps:patch
REGRESS_DEPENDS = print/ghostscript/gnu
REGRESS_DEPENDS = print/ghostscript/gnu \
shells/bash
post-extract:
# - Install a precompiled binary.
@ -107,7 +108,8 @@ post-extract:
. endfor
post-patch:
${SUBST_CMD} ${WRKSRC}/docs/index.html
${SUBST_CMD} ${WRKSRC}/docs/index.html \
${WRKSRC}/libraries/process/tests/process007.hs
post-install:
cd ${PREFIX}/lib/ghc && \

12
lang/ghc/patches/patch-libraries_process_tests_process007_hs Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libraries_process_tests_process007_hs,v 1.1 2011/09/16 21:17:41 kili Exp $
--- libraries/process/tests/process007.hs.orig Thu Sep 15 20:13:52 2011
+++ libraries/process/tests/process007.hs Thu Sep 15 20:09:08 2011
@@ -16,7 +16,7 @@ main = do
fd <- handleToFd =<< openFile tmpfile ReadMode
nul <- openFile "/dev/null" WriteMode
- (_,_,_,p) <- createProcess (shell ("cat 0<&" ++ show fd))
+ (_,_,_,p) <- createProcess (proc "${LOCALBASE}/bin/bash" ["-c", "cat 0<&" ++ show fd])
{ close_fds = True,
std_err = UseHandle nul }
e <- waitForProcess p