From 63cecbb9408271f0e713e1d2ccad2478b507c699 Mon Sep 17 00:00:00 2001 From: dougb Date: Sun, 7 Oct 2012 07:54:18 +0000 Subject: Work around a problem on stable/[89] with libotr generating an "undefined reference to `__stack_chk_fail_local'" error. None of the usual remedies work (such as making sure that gcc is used instead of ld for the linker) so on those releases we simply disable that option. pointyhat logs confirm that pidgin-otr (the only consumer of libotr atm) is failing on 8 and 9 with the same configure error that I am seeing on 8, so this patch should at least allow it to build on those releases. Bump PORTREVISION for libotr to err on the side of caution. While I'm here, remove a now-spurious mod to the pidgin-otr configure. --- security/libotr/Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'security/libotr') diff --git a/security/libotr/Makefile b/security/libotr/Makefile index c65e4856bc2f..3a39b7f28160 100644 --- a/security/libotr/Makefile +++ b/security/libotr/Makefile @@ -4,6 +4,7 @@ PORTNAME= libotr PORTVERSION= 4.0.0 # Please do not bump PORTREVISION for this port unless you have # confirmed via testing that it is necessary +PORTREVISION= 1 CATEGORIES= security net-im net MASTER_SITES= http://www.cypherpunks.ca/otr/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc @@ -34,8 +35,15 @@ MLINKS= otr_toolkit.1 otr_parse.1 \ verify: checksum gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc +.include + post-patch: @${REINPLACE_CMD} -e 's#^pkgconfigdir .*#pkgconfigdir = ${PREFIX}/libdata/pkgconfig#' \ ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.am -.include +.if ${OSVERSION} >= 800000 && ${OSVERSION} < 1000000 + ${REINPLACE_CMD} -e 's#OTR_CHECK_CFLAGS(.*stack-protector.*#dnl &#' \ + ${WRKSRC}/configure.ac +.endif + +.include -- cgit