View | Details | Raw Unified | Return to bug 192555 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/ports/security/libgcrypt/Makefile (-2 / +9 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	libgcrypt
3
PORTNAME=	libgcrypt
4
PORTVERSION=	1.6.1
4
PORTVERSION=	1.6.1
5
PORTREVISION=	3
5
PORTREVISION=	4
6
CATEGORIES=	security
6
CATEGORIES=	security
7
MASTER_SITES=	${MASTER_SITE_GNUPG}
7
MASTER_SITES=	${MASTER_SITE_GNUPG}
8
MASTER_SITE_SUBDIR=	${PORTNAME}
8
MASTER_SITE_SUBDIR=	${PORTNAME}
Lines 16-22 Link Here
16
BUILD_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
16
BUILD_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
17
RUN_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
17
RUN_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
18
18
19
USES=		libtool makeinfo tar:bzip2
19
USES=		compiler libtool makeinfo tar:bzip2
20
USE_CSTD=	gnu89
20
USE_CSTD=	gnu89
21
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
22
CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
22
CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
Lines 49-54 Link Here
49
49
50
.endif
50
.endif
51
51
52
.include <bsd.port.pre.mk>
53
54
.if ${CHOSEN_COMPILER_TYPE} == "gcc" && ${ARCH} == "amd64" && ${OSVERSION} < 900000
55
USE_GCC=	any
56
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure
57
.endif
58
52
post-patch:
59
post-patch:
53
	${RM} -f ${WRKSRC}/doc/gcrypt.info*
60
	${RM} -f ${WRKSRC}/doc/gcrypt.info*
54
	${REINPLACE_CMD} -e 's|ALIGN (3)|ALIGN (2)|g' ${WRKSRC}/mpi/i386/*.S
61
	${REINPLACE_CMD} -e 's|ALIGN (3)|ALIGN (2)|g' ${WRKSRC}/mpi/i386/*.S
(-)/usr/ports/security/libgcrypt/files/extra-patch-configure (+11 lines)
Line 0 Link Here
1
--- configure.orig	2014-08-10 19:51:24.000000000 +0200
2
+++ configure	2014-08-10 19:52:26.000000000 +0200
3
@@ -16493,7 +16493,7 @@
4
 $as_echo "$gcry_cv_gcc_amd64_platform_as_ok" >&6; }
5
   if test "$gcry_cv_gcc_amd64_platform_as_ok" = "yes" ; then
6
 
7
-$as_echo "#define HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS 1" >>confdefs.h
8
+$as_echo "#undef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS" >>confdefs.h
9
 
10
   fi
11
 fi

Return to bug 192555