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

Really fix devel/cpphs for !(i386|amd64). It's still not a good idea to

Browse Source 
fiddle with MULTI_PACKAGES in an arch-dependant .if block. Complements
ONLY_FOR_ARCHS-lib=amd64 i386.
This commit is contained in:
landry 2010-10-03 14:33:32 +00:00
parent 45fc5dbec4
commit 011c903487
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/cpphs/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2010/09/27 19:40:20 kili Exp $ # $OpenBSD: Makefile,v 1.18 2010/10/03 14:33:32 landry Exp $
COMMENT-main = liberalised reimplementation of cpp in Haskell COMMENT-main = liberalised reimplementation of cpp in Haskell
COMMENT-lib = cpphs library COMMENT-lib = cpphs library
@ -20,14 +20,13 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes PERMIT_DISTFILES_FTP = Yes
MULTI_PACKAGES = -main MULTI_PACKAGES = -main -lib
WANTLIB-main = ${WANTLIB} c m pthread WANTLIB-main = ${WANTLIB} c m pthread
SUBST_VARS += DISTNAME SUBST_VARS += DISTNAME
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
# GHC: use cabal to build both the executable and the library. # GHC: use cabal to build both the executable and the library.
MULTI_PACKAGES += -lib
WANTLIB-main += gmp util WANTLIB-main += gmp util
MODULES = lang/ghc converters/libiconv MODULES = lang/ghc converters/libiconv
MODGHC_BUILD = cabal haddock register MODGHC_BUILD = cabal haddock register