svn commit: r373430 - head/x11-toolkits/vte3

Koop Mast kwm at FreeBSD.org
Tue Nov 25 20:49:22 UTC 2014


Author: kwm
Date: Tue Nov 25 20:49:21 2014
New Revision: 373430
URL: https://svnweb.freebsd.org/changeset/ports/373430
QAT: https://qat.redports.org/buildarchive/r373430/

Log:
  Make sure vte doesn't enabled stack-protector on it own on i386 when
  OSVERSION < 1000036 (taken from bsd.ssp.mk). Else it fails to build with:
  libvte-2.91.so: undefined reference to `__stack_chk_fail_local'.
  
  PR:		195267
  Submitted by:	bar@

Modified:
  head/x11-toolkits/vte3/Makefile

Modified: head/x11-toolkits/vte3/Makefile
==============================================================================
--- head/x11-toolkits/vte3/Makefile	Tue Nov 25 19:49:56 2014	(r373429)
+++ head/x11-toolkits/vte3/Makefile	Tue Nov 25 20:49:21 2014	(r373430)
@@ -49,11 +49,17 @@ PLIST_SUB=	VERSION=2.91
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-gnome-pty-helper_gnome-utmp.c
 .endif
 
-.if ${VTE3_SLAVE} != yes
 post-patch:
+.if ${VTE3_SLAVE} != yes
 	@${REINPLACE_CMD} -e 's|-Wno-unused-but-set-variable||g' \
 		${WRKSRC}/src/Makefile.in
 .endif
+# borrowed osversion from bsd.ssp.mk
+.if ${OSVERSION} < 1000036 && ${ARCH} == i386
+	@${REINPLACE_CMD} -e 's|-fstack-protector-strong||g; \
+		s|-fstack-protector||g' \
+		${WRKSRC}/configure
+.endif
 
 .include <bsd.port.mk>
 


More information about the svn-ports-head mailing list