diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2014-09-02 20:47:43 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2014-09-02 20:47:43 +0000 |
| commit | 04e41683da5ef34dce4ade8a637e4bfc9da38b47 (patch) | |
| tree | 517d2e0b3f4d25bfe9eed1d6d270858eadd8ecd6 /security/libgcrypt | |
| parent | 3107f4db2b731d2c8837541e045742070d6bbccf (diff) | |
| download | ports-04e41683da5ef34dce4ade8a637e4bfc9da38b47.tar.gz ports-04e41683da5ef34dce4ade8a637e4bfc9da38b47.zip | |
security/libgcrypt: fix build without assembler on 8.x/amd64
PR: 192555
Submitted by: Carlos Jacobo Puga Medina <cpm@fbsd.es>
Approved by: maintainer (timeout)
Notes
Notes:
svn path=/head/; revision=367081
Diffstat (limited to 'security/libgcrypt')
| -rw-r--r-- | security/libgcrypt/Makefile | 12 | ||||
| -rw-r--r-- | security/libgcrypt/files/extra-patch-configure | 11 |
2 files changed, 18 insertions, 5 deletions
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile index b0d50ed22485..81bfbf4bd656 100644 --- a/security/libgcrypt/Makefile +++ b/security/libgcrypt/Makefile @@ -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} diff --git a/security/libgcrypt/files/extra-patch-configure b/security/libgcrypt/files/extra-patch-configure new file mode 100644 index 000000000000..9aa286ff144f --- /dev/null +++ b/security/libgcrypt/files/extra-patch-configure @@ -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 |