From owner-svn-ports-head@FreeBSD.ORG Sat May 10 21:48:26 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 250123C6; Sat, 10 May 2014 21:48:26 +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 EC7AAD86; Sat, 10 May 2014 21:48:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4ALmPYJ060352; Sat, 10 May 2014 21:48:25 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4ALmPpB060351; Sat, 10 May 2014 21:48:25 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201405102148.s4ALmPpB060351@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sat, 10 May 2014 21:48:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353614 - head/devel/thrift-cpp 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: Sat, 10 May 2014 21:48:26 -0000 Author: rakuco Date: Sat May 10 21:48:25 2014 New Revision: 353614 URL: http://svnweb.freebsd.org/changeset/ports/353614 QAT: https://qat.redports.org/buildarchive/r353614/ Log: - Fix the build by building and installing from the right subdirectory. - Support staging. PR: ports/185839 MFH: 2014Q2 Modified: head/devel/thrift-cpp/Makefile Modified: head/devel/thrift-cpp/Makefile ============================================================================== --- head/devel/thrift-cpp/Makefile Sat May 10 21:38:56 2014 (r353613) +++ head/devel/thrift-cpp/Makefile Sat May 10 21:48:25 2014 (r353614) @@ -20,8 +20,6 @@ DISTINFO_FILE= ${.CURDIR}/../thrift/dis LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ libevent-1.4.so:${PORTSDIR}/devel/libevent -BUILDIR= ${WRKDIR}/${DISTNAME}/lib/cpp - USE_AUTOTOOLS= autoconf autoheader:env aclocal automake libtool ACLOCAL_ARGS= -I${WRKSRC}/aclocal AUTOMAKE_ARGS= --foreign --add-missing --copy @@ -31,6 +29,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes PLIST_SUB= PORTVERSION="${THRIFT_PORTVERSION}" +BUILD_WRKSRC= ${WRKSRC}/lib/cpp +INSTALL_WRKSRC= ${WRKSRC}/lib/cpp OPTIONS_DEFINE= QT4 QT4_CONFIGURE_WITH= qt4 @@ -50,9 +50,6 @@ CONFIGURE_ARGS+= \ --without-python \ --without-ruby - -NO_STAGE= yes - .include .if ${COMPILER_TYPE} == clang @@ -67,11 +64,11 @@ post-patch: @${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/cpp/Makefile.am post-install: - @${LN} -sf ${PREFIX}/lib/libthrift-${PORTVERSION}.so ${PREFIX}/lib/libthrift.so.0 - @${LN} -sf ${PREFIX}/lib/libthriftnb-${PORTVERSION}.so ${PREFIX}/lib/libthriftnb.so.0 - @${LN} -sf ${PREFIX}/lib/libthriftz-${PORTVERSION}.so ${PREFIX}/lib/libthriftz.so.0 + ${LN} -sf libthrift-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthrift.so.0 + ${LN} -sf libthriftnb-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthriftnb.so.0 + ${LN} -sf libthriftz-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthriftz.so.0 .if ${PORT_OPTIONS:MQT4} - @${LN} -sf ${PREFIX}/lib/libthriftqt-${PORTVERSION}.so ${PREFIX}/lib/libthriftqt.so.0 + ${LN} -sf libthriftqt-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthriftqt.so.0 .endif .include "../thrift/bsd.thrift.mk"