Attachment #152642 for bug #197146

Lines 2-7 Link Here

(-)/usr/ports/security/libgcrypt/Makefile (-2 / +9 lines)
2		2
3	PORTNAME= libgcrypt	3	PORTNAME= libgcrypt
4	PORTVERSION= 1.6.2	4	PORTVERSION= 1.6.2
		5	PORTREVISION= 1
5	CATEGORIES= security	6	CATEGORIES= security
6	MASTER_SITES= ${MASTER_SITE_GNUPG}	7	MASTER_SITES= ${MASTER_SITE_GNUPG}
7	MASTER_SITE_SUBDIR= ${PORTNAME}	8	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 21-27 Link Here
21	CONFIGURE_ARGS= --disable-drng-support	22	CONFIGURE_ARGS= --disable-drng-support
22	CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"	23	CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
23	CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}	24	CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
24	INSTALL_TARGET= install-strip
25	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
26		26
27	DOCS= AUTHORS ChangeLog ChangeLog-2011 INSTALL NEWS README \	27	DOCS= AUTHORS ChangeLog ChangeLog-2011 INSTALL NEWS README \
Lines 53-60 Link Here
53	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure	53	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure
54	.endif	54	.endif
55		55
56	.if ${PORT_OPTIONS:MDOCS}	56	# Fix crash at cipher/salsa20.c module on amd64
		57	.if ${ARCH} == "amd64" && exists(/usr/bin/clang)
		58	CFLAGS:= ${CFLAGS:N-O*} -O2
		59	.endif
		60
57	post-install:	61	post-install:
		62	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so.20.0.2
		63
		64	.if ${PORT_OPTIONS:MDOCS}
58	${MKDIR} ${STAGEDIR}${DOCSDIR}	65	${MKDIR} ${STAGEDIR}${DOCSDIR}
59	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}	66	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
60	.endif	67	.endif




--- cipher/Makefile.in.orig	2015-01-21 19:09:47.000000000 +0100
+++ cipher/Makefile.in	2015-01-21 19:13:35.000000000 +0100
@@ -766,6 +766,12 @@
 tiger.lo: $(srcdir)/tiger.c
 	`echo $(LTCOMPILE) -c $(srcdir)/tiger.c | $(o_flag_munging) `
 
+salsa20.o: $(srcdir)/salsa20.c
+	`echo $(COMPILE) -c $(srcdir)/salsa20.c | $(o_flag_munging) `
+
+salsa20.lo: $(srcdir)/salsa20.c
+	`echo $(LTCOMPILE) -c $(srcdir)/salsa20.c | $(o_flag_munging) `
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Return to bug 197146

Line 0 Link Here

(-)/usr/ports/security/libgcrypt/files/patch-cipher-Makefile.in (+15 lines)
	1	--- cipher/Makefile.in.orig 2015-01-21 19:09:47.000000000 +0100
	2	+++ cipher/Makefile.in 2015-01-21 19:13:35.000000000 +0100
	3	@@ -766,6 +766,12 @@
	4	tiger.lo: $(srcdir)/tiger.c
	5	`echo $(LTCOMPILE) -c $(srcdir)/tiger.c \| $(o_flag_munging) `
	6
	7	+salsa20.o: $(srcdir)/salsa20.c
	8	+ `echo $(COMPILE) -c $(srcdir)/salsa20.c \| $(o_flag_munging) `
	9	+
	10	+salsa20.lo: $(srcdir)/salsa20.c
	11	+ `echo $(LTCOMPILE) -c $(srcdir)/salsa20.c \| $(o_flag_munging) `
	12	+
	13	# Tell versions [3.59,3.63) of GNU make to not export all variables.
	14	# Otherwise a system limit (for SysV at least) may be exceeded.
	15	.NOEXPORT: