From f5af979effe0d0f3e0615d46c5090a126052387f Mon Sep 17 00:00:00 2001 From: Andrej Zverev Date: Sun, 24 Nov 2013 15:48:16 +0000 Subject: [PATCH] Try to unbreak for freebsd > 10.x --- net-p2p/libtorrent-devel/Makefile | 7 ++++++- net-p2p/rtorrent-devel/Makefile | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/net-p2p/libtorrent-devel/Makefile b/net-p2p/libtorrent-devel/Makefile index 36246426d607..38c44828996f 100644 --- a/net-p2p/libtorrent-devel/Makefile +++ b/net-p2p/libtorrent-devel/Makefile @@ -38,8 +38,13 @@ CONFIGURE_ENV= OPENSSL_LIBS="-L/usr/lib -ssl -crypto" OPENSSL_CFLAGS="-I/usr/inc CONFIGURE_ARGS+= --disable-debug +# Workaround to build on > 10.x +.if ${OSVERSION} >= 1000000 +USE_GCC= yes +.endif + post-patch: - @${REINPLACE_CMD} -e 's/-O3/${CFLAGS}/' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/configure .if ${PORT_OPTIONS:MKQUEUE} CONFIGURE_ARGS+= --with-kqueue diff --git a/net-p2p/rtorrent-devel/Makefile b/net-p2p/rtorrent-devel/Makefile index e329dfb23880..ccfdbfc15f31 100644 --- a/net-p2p/rtorrent-devel/Makefile +++ b/net-p2p/rtorrent-devel/Makefile @@ -36,6 +36,12 @@ NO_STAGE= yes BROKEN= Does not configure on arm .endif +# Workaround to build and segfault on > 10.x +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1000000 +USE_GCC= yes +LDFLAGS+= -lc++ +.endif + .if ${PORT_OPTIONS:MXMLRPC} CONFIGURE_ARGS+= --with-xmlrpc-c LIB_DEPENDS+= xmlrpc:${PORTSDIR}/net/xmlrpc-c-devel