diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2012-10-07 07:54:18 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2012-10-07 07:54:18 +0000 |
| commit | a424a10aaeaadd2ada128b746a94f0a36e79794a (patch) | |
| tree | 55fe4e90266faae4d6ef0a118878853d10bbec82 /security/libotr | |
| parent | b9d17cc985bf3659065f9209de060101663fb9f3 (diff) | |
| download | ports-a424a10aaeaadd2ada128b746a94f0a36e79794a.tar.gz ports-a424a10aaeaadd2ada128b746a94f0a36e79794a.zip | |
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.
Notes
Notes:
svn path=/head/; revision=305438
Diffstat (limited to 'security/libotr')
| -rw-r--r-- | security/libotr/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
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 <bsd.port.pre.mk> + post-patch: @${REINPLACE_CMD} -e 's#^pkgconfigdir .*#pkgconfigdir = ${PREFIX}/libdata/pkgconfig#' \ ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.am -.include <bsd.port.mk> +.if ${OSVERSION} >= 800000 && ${OSVERSION} < 1000000 + ${REINPLACE_CMD} -e 's#OTR_CHECK_CFLAGS(.*stack-protector.*#dnl &#' \ + ${WRKSRC}/configure.ac +.endif + +.include <bsd.port.post.mk> |