Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Dec 2015 15:22:35 +0000 (UTC)
From:      Raphael Kubo da Costa <rakuco@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r402993 - in head/security: fastd fastd-devel
Message-ID:  <201512041522.tB4FMZb1068183@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rakuco
Date: Fri Dec  4 15:22:34 2015
New Revision: 402993
URL: https://svnweb.freebsd.org/changeset/ports/402993

Log:
  fastd, fastd-devel: Disable mpclmul module on FreeBSD 9.
  
  This fixes the build on 9, which has failed ever since it was added to the
  tree.
  
  From the fallout logs:
    CMake Error at src/crypto/mac/ghash/pclmulqdq/CMakeLists.txt:9 (message):
      WITH_MAC_GHASH_PCLMULQDQ enabled, but there is no compiler support for
      -mpclmul
  
  This happens because GCC 4.2.1 in base (the default compiler) does not
  support the -mpcmul option.
  
  Fix it by disabling the module when on FreeBSD < 10 (i.e. when base GCC is
  the default compiler).
  
  PR		205017
  PR:		205018
  Approved by:	Jan Bramkamp <crest_maintainer@rlwinm.de> (maintainer)

Modified:
  head/security/fastd-devel/Makefile
  head/security/fastd/Makefile

Modified: head/security/fastd-devel/Makefile
==============================================================================
--- head/security/fastd-devel/Makefile	Fri Dec  4 15:03:12 2015	(r402992)
+++ head/security/fastd-devel/Makefile	Fri Dec  4 15:22:34 2015	(r402993)
@@ -27,7 +27,14 @@ USE_RC_SUBR=		fastd_devel
 PLIST_FILES=		bin/fastd-devel           \
 			man/man1/fastd-devel.1.gz
 
+.include <bsd.port.pre.mk>
+
+# GCC from base does not support -mpclmul.
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000024
+CMAKE_ARGS+=		-DWITH_MAC_GHASH_PCLMULQDQ=FALSE
+.endif
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/fastd.1 ${STAGEDIR}${PREFIX}/man/man1/fastd-devel.1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/security/fastd/Makefile
==============================================================================
--- head/security/fastd/Makefile	Fri Dec  4 15:03:12 2015	(r402992)
+++ head/security/fastd/Makefile	Fri Dec  4 15:22:34 2015	(r402993)
@@ -22,7 +22,14 @@ USE_RC_SUBR=		fastd
 PLIST_FILES=		bin/fastd           \
 			man/man1/fastd.1.gz
 
+.include <bsd.port.pre.mk>
+
+# GCC from base does not support -mpclmul.
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000024
+CMAKE_ARGS+=		-DWITH_MAC_GHASH_PCLMULQDQ=FALSE
+.endif
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/fastd.1 ${STAGEDIR}${PREFIX}/man/man1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512041522.tB4FMZb1068183>