Attachment 145756 Details for Bug 192555 – libgcrypt-fix-asm-8.x-v1.diff

[patch] libgcrypt-fix-asm-8.x-v1.diff

libgcrypt-fix-asm-8.x-v1.diff (text/plain), 1.74 KB, created by Carlos J Puga Medina on 2014-08-13 14:15:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J Puga Medina

Created: 2014-08-13 14:15:01 UTC

Size: 1.74 KB

patch

obsolete

>diff -urN /usr/ports/security/libgcrypt.old/Makefile /usr/ports/security/libgcrypt/Makefile
>--- /usr/ports/security/libgcrypt.old/Makefile	2014-08-06 00:13:29.000000000 +0200
>+++ /usr/ports/security/libgcrypt/Makefile	2014-08-13 14:48:45.000000000 +0200
>@@ -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-aesni-support
> .endif
> 
>-.elif ${ARCH} == "amd64"
>-.if (${OSVERSION} < 900000)
>-USE_GCC=	yes
>-.endif
> CONFIGURE_ARGS+=	--disable-drng-support
> 
> .endif
>@@ -53,6 +49,12 @@
> 	${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}
>diff -urN /usr/ports/security/libgcrypt.old/files/extra-patch-configure /usr/ports/security/libgcrypt/files/extra-patch-configure
>--- /usr/ports/security/libgcrypt.old/files/extra-patch-configure	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/security/libgcrypt/files/extra-patch-configure	2014-08-13 12:44:15.000000000 +0200
>@@ -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

Actions: View | Diff

Attachments on bug 192555: 145618 | 145657 | 145708 | 145756 | 146721 | 146723 | 146724 | 146774 | 146778 | 146779