From owner-svn-ports-head@FreeBSD.ORG Sun Jul 13 10:17:46 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 886DC781; Sun, 13 Jul 2014 10:17:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5BE162854; Sun, 13 Jul 2014 10:17:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6DAHkvG085974; Sun, 13 Jul 2014 10:17:46 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6DAHkYn085973; Sun, 13 Jul 2014 10:17:46 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201407131017.s6DAHkYn085973@svn.freebsd.org> From: Guido Falsi Date: Sun, 13 Jul 2014 10:17:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361670 - head/net-p2p/libtorrent X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jul 2014 10:17:46 -0000 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. [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 -.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