diff options
| author | pgj <pgj@FreeBSD.org> | 2013-01-22 18:52:37 +0800 |
|---|---|---|
| committer | pgj <pgj@FreeBSD.org> | 2013-01-22 18:52:37 +0800 |
| commit | a47972b3a0b573c8051556abfaa4e43013cbc521 (patch) | |
| tree | aeda7ba8b1a22267ec96fb0950909fe1ec41ad37 /lang/ghc | |
| parent | e2b3e5863630cc8f35af1780ca7c2f108648b844 (diff) | |
| download | freebsd-ports-gnome-a47972b3a0b573c8051556abfaa4e43013cbc521.tar.gz freebsd-ports-gnome-a47972b3a0b573c8051556abfaa4e43013cbc521.tar.zst freebsd-ports-gnome-a47972b3a0b573c8051556abfaa4e43013cbc521.zip | |
- Fix configure flags for the bootstrap compiler, so now it works for
clang-only base systems too [1]
- Allow to use GCC 4.6 and later (requested by: gerald)
- Add USE_NCURSES, so now it can pick up ports ncurses when installed
- Fix COMMENT to comply with the Porter's Handbook
PR: ports/161356 [1]
Submitted by: David Marker <dmarker@freedave.net> (reworked by: ashish) [1]
Obtained from: FreeBSD Haskell
Diffstat (limited to 'lang/ghc')
| -rw-r--r-- | lang/ghc/Makefile | 11 | ||||
| -rw-r--r-- | lang/ghc/bsd.cabal.mk | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 8b68bb888860..6a3c01ede6ea 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR= pgj/:boot DISTFILES= ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source MAINTAINER= haskell@FreeBSD.org -COMMENT= A Compiler for the functional language Haskell +COMMENT= Compiler for the functional language Haskell ONLY_FOR_ARCHS= i386 amd64 @@ -30,7 +30,8 @@ USE_PERL5_BUILD= yes USE_GMAKE= yes USE_ICONV= yes USE_BINUTILS= yes -USE_GCC= 4.6 +USE_GCC= 4.6+ +USE_NCURSES= yes LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE @@ -121,7 +122,7 @@ BOOT_HSC2HS= ${BOOT_DIR}/bin/hsc2hs SLAVE_CMD= ${SETENV} PATH=${BOOT_DIR}/bin:${PATH} -CONFIGURE_ARGS_BOOT= --prefix=${BOOT_DIR} CC=${CC} +CONFIGURE_ARGS_BOOT= --prefix=${BOOT_DIR} --with-gcc=${CC} CONFIGURE_ARGS+= --with-ghc=${BOOT_GHC} .else # MBOOT @@ -201,13 +202,13 @@ post-extract: .else @${ECHO} >> ${WRKSRC}/mk/build.mk "BSD_PATH_TO_HSC2HS = ${BOOT_HSC2HS}" .endif - @${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_HC_OPTS += -I/usr/include -L/usr/lib -I${LOCALBASE}/include -L${LOCALBASE}/lib" + @${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_HC_OPTS += -I${NCURSESINC} -L${NCURSESLIB} -I${LOCALBASE}/include -L${LOCALBASE}/lib" @${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_CC_OPTS += ${CFLAGS}" @${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_HSC2HS_OPTS += -I${LOCALBASE}/include --lflag=-L${LOCALBASE}/lib" @${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_LD_OPTS += -L${LOCALBASE}/lib" @${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_CABAL_CONFIGURE_FLAGS += --extra-include-dirs=${LOCALBASE}/include" @${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_CABAL_CONFIGURE_FLAGS += --extra-lib-dirs=${LOCALBASE}/lib" - @${ECHO} >> ${WRKSRC}/mk/build.mk "libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes=/usr/include --configure-option=--with-curses-libraries=/usr/lib" + @${ECHO} >> ${WRKSRC}/mk/build.mk "libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes=${NCURSESINC} --configure-option=--with-curses-libraries=${NCURSESLIB}" # @${ECHO} >> ${WRKSRC}/mk/build.mk "BIN_DIST_NAME = ghc-\$$(ProjectVersion)-boot" # @${ECHO} >> ${WRKSRC}/mk/build.mk "BIN_DIST_TAR = ghc-\$$(ProjectVersion)-amd64-ash0-freebsd8-boot.tar" diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk index 7bfaddead2c0..0dafe365c6b3 100644 --- a/lang/ghc/bsd.cabal.mk +++ b/lang/ghc/bsd.cabal.mk @@ -81,7 +81,7 @@ BUILD_DEPENDS+= ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc .endif USE_BINUTILS= yes -USE_GCC= 4.6 +USE_GCC= 4.6+ .if ${PORT_OPTIONS:MDYNAMIC} LIB_DEPENDS+= ffi.5:${PORTSDIR}/devel/libffi |