Date: Sun, 13 Jul 2014 10:17:46 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361670 - head/net-p2p/libtorrent Message-ID: <201407131017.s6DAHkYn085973@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sun Jul 13 10:17:45 2014 New Revision: 361670 URL: http://svnweb.freebsd.org/changeset/ports/361670 QAT: https://qat.redports.org/buildarchive/r361670/ Log: - Fix build when security/libressl is installed [1] - While here, reorganize the Makefile a little Reported by: Kenta S. <kentas@hush.com> [1] Modified: head/net-p2p/libtorrent/Makefile Modified: head/net-p2p/libtorrent/Makefile ============================================================================== --- head/net-p2p/libtorrent/Makefile Sun Jul 13 10:12:12 2014 (r361669) +++ head/net-p2p/libtorrent/Makefile Sun Jul 13 10:17:45 2014 (r361670) @@ -16,6 +16,8 @@ USES= compiler:c++11-lang libtool pathf USE_OPENSSL= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-debug +CONFIGURE_ENV= OPENSSL_LIBS="-L${OPENSSLBASE}/lib -ssl -crypto" OPENSSL_CFLAGS="-I${OPENSSLBASE}/include" OPTIONS_DEFINE= KQUEUE IPV6 OPTIONS_DEFAULT= KQUEUE @@ -23,15 +25,6 @@ KQUEUE_DESC= Use kqueue(2) support .include <bsd.port.pre.mk> -.if defined(WITH_OPENSSL_BASE) -# The reason why I use this is cause openssl from base doesn't install a .pc file -# and configure will fail trying to find it. Setting both of those variables to -# a *non-empty* value by-passes the pkg-config check. -CONFIGURE_ENV= OPENSSL_LIBS="-L/usr/lib -ssl -crypto" OPENSSL_CFLAGS="-I/usr/include" -.endif - -CONFIGURE_ARGS+= --disable-debug - # Disable amd64 atomic ops on i386 when using gcc # undefined reference to __sync_add_and_fetch_8 # undefined reference to __sync_fetch_and_and_8 @@ -45,6 +38,14 @@ CXXFLAGS+= -std=c++11 EXTRA_PATCHES+= ${FILESDIR}/extra-clang .endif +.if ${PORT_OPTIONS:MKQUEUE} +CONFIGURE_ARGS+= --with-kqueue +.endif + +.if ${PORT_OPTIONS:MIPV6} +CONFIGURE_ARGS+= --enable-ipv6 +.endif + post-patch: @${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/configure .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 @@ -58,12 +59,4 @@ post-patch: ${WRKSRC}/src/torrent/utils/log.cc .endif -.if ${PORT_OPTIONS:MKQUEUE} -CONFIGURE_ARGS+= --with-kqueue -.endif - -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6 -.endif - .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407131017.s6DAHkYn085973>