svn commit: r496481 - in head: devel/hs-hashable lang/ghc

[Gleb Popov]

Author: arrowd
Date: Thu Mar 21 17:38:10 2019
New Revision: 496481
URL: https://svnweb.freebsd.org/changeset/ports/496481

Log:
  bsd.cabal.mk: Add USE_BINUTILS for powerpc64 arch and add support for FLAGS_DEFAULT_${ARCH} variables.
  
  PR:		236346
  Submitted by:	 Piotr Kubaj <pkubaj at anongoth.pl>
  Reviewed by:	Mikael Urankar <mikael.urankar at gmail.com>
  Approved by:	tcberner (mentor)

Modified:
  head/devel/hs-hashable/Makefile
  head/lang/ghc/bsd.cabal.mk
  head/lang/ghc/bsd.cabal.options.mk

Modified: head/devel/hs-hashable/Makefile
==============================================================================
--- head/devel/hs-hashable/Makefile	Thu Mar 21 17:34:20 2019	(r496480)
+++ head/devel/hs-hashable/Makefile	Thu Mar 21 17:38:10 2019	(r496481)
@@ -12,7 +12,8 @@ COMMENT=	Class for types that can be converted to a ha
 LICENSE=	BSD3CLAUSE
 
 FLAGS_DEFINE=			INTEGER_GMP SSE2 SSE41
-FLAGS_DEFAULT=			INTEGER_GMP SSE2
+FLAGS_DEFAULT_amd64=		INTEGER_GMP SSE2
+FLAGS_DEFAULT_i386=		INTEGER_GMP SSE2
 
 INTEGER_GMP_DESC=		Use integer-gmp for fast Integer instances
 INTEGER_GMP_FLAG_ENABLE=	integer-gmp

Modified: head/lang/ghc/bsd.cabal.mk
==============================================================================
--- head/lang/ghc/bsd.cabal.mk	Thu Mar 21 17:34:20 2019	(r496480)
+++ head/lang/ghc/bsd.cabal.mk	Thu Mar 21 17:38:10 2019	(r496481)
@@ -93,6 +93,9 @@ BUILD_DEPENDS+=	ghc:lang/ghc
 BUILD_DEPENDS+=	ghc>=${GHC_VERSION}:lang/ghc
 .endif
 
+.if ${ARCH} == powerpc64
+USE_BINUTILS=	yes
+.endif
 
 CONFIGURE_ARGS+=	--with-gcc=${CC} --with-ld=${LD} --with-ar=${AR}
 

Modified: head/lang/ghc/bsd.cabal.options.mk
==============================================================================
--- head/lang/ghc/bsd.cabal.options.mk	Thu Mar 21 17:34:20 2019	(r496480)
+++ head/lang/ghc/bsd.cabal.options.mk	Thu Mar 21 17:38:10 2019	(r496481)
@@ -52,6 +52,7 @@ OPTIONS_DEFINE+=	${FLAGS_DEFINE}
 OPTIONS_SINGLE+=	${FLAGS_SINGLE}
 OPTIONS_MULTI+=		${FLAGS_MULTI}
 OPTIONS_DEFAULT+=	${FLAGS_DEFAULT}
+OPTIONS_DEFAULT_${ARCH}+=	${FLAGS_DEFAULT_${ARCH}}
 
 _ALL_FLAGS:=		${FLAGS_DEFINE} ${FLAGS_SINGLE} ${FLAGS_MULTI}
 _COMPLETE_FLAGS=	${_ALL_FLAGS}