svn commit: r420894 - head/net-p2p/libtorrent
Kurt Jaeger
pi at FreeBSD.org
Fri Aug 26 06:38:03 UTC 2016
Author: pi
Date: Fri Aug 26 06:38:02 2016
New Revision: 420894
URL: https://svnweb.freebsd.org/changeset/ports/420894
Log:
net-p2p/libtorrent: Explicitly link with libcrypto
- make sure that net-p2p/libtorrent links with libcrypto
PR: 211223
Submitted by: Tobias Kortkamp <t at tobik.me>
Approved by: pipfstarrd at opmbx.org (maintainer)
Modified:
head/net-p2p/libtorrent/Makefile
Modified: head/net-p2p/libtorrent/Makefile
==============================================================================
--- head/net-p2p/libtorrent/Makefile Fri Aug 26 06:18:01 2016 (r420893)
+++ head/net-p2p/libtorrent/Makefile Fri Aug 26 06:38:02 2016 (r420894)
@@ -2,6 +2,7 @@
PORTNAME= libtorrent
PORTVERSION= 0.13.6
+PORTREVISION= 1
CATEGORIES= net-p2p
MASTER_SITES= http://rtorrent.net/downloads/
@@ -16,7 +17,8 @@ CONFLICTS_INSTALL= rblibtorrent-[0-9]* r
USES= compiler:c++11-lang libtool pathfix pkgconfig ssl
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-debug
-CONFIGURE_ENV= OPENSSL_LIBS="-L${OPENSSLBASE}/lib -ssl -crypto" OPENSSL_CFLAGS="-I${OPENSSLBASE}/include"
+CONFIGURE_ENV= OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" OPENSSL_CFLAGS="-I\
+ ${OPENSSLINC}"
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
@@ -24,6 +26,10 @@ OPTIONS_DEFINE= IPV6 KQUEUE
OPTIONS_DEFAULT=KQUEUE
KQUEUE_DESC= Use kqueue(2) support
+# This makes sure that /usr/local/lib appears before /usr/lib when
+# linking libtorrent to avoid linking with base's libcrypto.
+MAKE_ARGS= LDFLAGS="${LDFLAGS}"
+
IPV6_CONFIGURE_ENABLE= ipv6
KQUEUE_CONFIGURE_WITH= kqueue
@@ -43,7 +49,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-clang
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/configure
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
@${FIND} ${WRKSRC} \( -name '*.h' -o -name '*.cc' \) -type f \
-exec ${REINPLACE_CMD} -e 's/tr1::/std::/g' {} \; \
More information about the svn-ports-all
mailing list