svn commit: r367081 - in head/security/libgcrypt: . files

[Kurt Jaeger]

Author: pi
Date: Tue Sep  2 20:47:43 2014
New Revision: 367081
URL: http://svnweb.freebsd.org/changeset/ports/367081
QAT: https://qat.redports.org/buildarchive/r367081/

Log:
  security/libgcrypt: fix build without assembler on 8.x/amd64
  
  PR:		192555
  Submitted by:	Carlos Jacobo Puga Medina <cpm at fbsd.es>
  Approved by:	maintainer (timeout)

Added:
  head/security/libgcrypt/files/extra-patch-configure   (contents, props changed)
Modified:
  head/security/libgcrypt/Makefile

Modified: head/security/libgcrypt/Makefile
==============================================================================
--- head/security/libgcrypt/Makefile	Tue Sep  2 20:35:33 2014	(r367080)
+++ head/security/libgcrypt/Makefile	Tue Sep  2 20:47:43 2014	(r367081)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libgcrypt
 PORTVERSION=	1.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -41,10 +41,6 @@ CONFIGURE_ARGS+=	--disable-asm
 CONFIGURE_ARGS+=	--disable-aesni-support
 .endif
 
-.elif ${ARCH} == "amd64"
-.if (${OSVERSION} < 900000)
-USE_GCC=	yes
-.endif
 CONFIGURE_ARGS+=	--disable-drng-support
 
 .endif
@@ -53,6 +49,12 @@ post-patch:
 	${RM} -f ${WRKSRC}/doc/gcrypt.info*
 	${REINPLACE_CMD} -e 's|ALIGN (3)|ALIGN (2)|g' ${WRKSRC}/mpi/i386/*.S
 
+# Fix build without ASM on 8.x/amd64
+.if ${OPSYS} == FreeBSD && ${ARCH} == "amd64" && ${OSVERSION} < 900000
+USE_GCC=	any
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure
+.endif
+
 .if ${PORT_OPTIONS:MDOCS}
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}

Added: head/security/libgcrypt/files/extra-patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/libgcrypt/files/extra-patch-configure	Tue Sep  2 20:47:43 2014	(r367081)
@@ -0,0 +1,11 @@
+--- configure.orig	2014-08-10 19:51:24.000000000 +0200
++++ configure	2014-08-10 19:52:26.000000000 +0200
+@@ -16493,7 +16493,7 @@
+ $as_echo "$gcry_cv_gcc_amd64_platform_as_ok" >&6; }
+   if test "$gcry_cv_gcc_amd64_platform_as_ok" = "yes" ; then
+ 
+-$as_echo "#define HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS 1" >>confdefs.h
++$as_echo "#undef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS" >>confdefs.h
+ 
+   fi
+ fi