Date: Sat, 10 May 2014 23:24:34 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r353629 - branches/2014Q2/devel/thrift-cpp Message-ID: <201405102324.s4ANOYp2005544@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Sat May 10 23:24:34 2014 New Revision: 353629 URL: http://svnweb.freebsd.org/changeset/ports/353629 QAT: https://qat.redports.org/buildarchive/r353629/ Log: MFH: r353614 - Fix the build by building and installing from the right subdirectory. - Support staging. PR: ports/185839 Approved by: portmgr (bapt) Modified: branches/2014Q2/devel/thrift-cpp/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/thrift-cpp/Makefile ============================================================================== --- branches/2014Q2/devel/thrift-cpp/Makefile Sat May 10 23:21:52 2014 (r353628) +++ branches/2014Q2/devel/thrift-cpp/Makefile Sat May 10 23:24:34 2014 (r353629) @@ -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 <bsd.port.pre.mk> .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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405102324.s4ANOYp2005544>