svn commit: r384031 - in head/net/libsrtp: . files

Jan Beich jbeich at FreeBSD.org
Wed Apr 15 04:42:25 UTC 2015


Jan Beich <jbeich at FreeBSD.org> writes:

>>   Implement regression-check target (also known under other aliases)
>>   using upstream's self-tests.
> [...]
>>  post-build:
>>  	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
>>  		${MAKEFILE} ${MAKE_ARGS} shared_library)
>>  
>> +check test runtest regression-test: build
>> +	${SETENV} LD_LIBRARY_PATH=${WRKSRC} ${MAKE_CMD} -C ${WRKSRC} runtest
>> +
>
> Maybe convert to DO_MAKE_BUILD ? shared_library ignores MAKE_JOBS_NUMBER
> while runtest ignores MAKE_ENV (mainly HOME=${WRKDIR}).
>
> post-build:
> 	@(cd ${WRKSRC} && ${DO_MAKE_BUILD} shared_library)
>
> check test runtest regression-test: build
> 	@(cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
> 		${DO_MAKE_BUILD} runtest)

Here's a patch. post-build is also almost identical to do-build,
so can be converted to ALL_TARGET+=shared_library.

Index: net/libsrtp/Makefile
===================================================================
--- net/libsrtp/Makefile	(revision 384037)
+++ net/libsrtp/Makefile	(working copy)
@@ -20,6 +20,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-openssl
 CPPFLAGS+=	-I${OPENSSLBASE}/include
 LIBS+=		-L${OPENSSLBASE}/lib
+ALL_TARGET=	all shared_library
 USES=		gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
@@ -37,11 +38,8 @@ WITH_OPENSSL_PORT=	yes
 post-patch:
 	@${REINPLACE_CMD} '/pkg-config.*openssl/d' ${WRKSRC}/configure
 
-post-build:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
-		${MAKEFILE} ${MAKE_ARGS} shared_library)
-
 check test runtest regression-test: build
-	${SETENV} LD_LIBRARY_PATH=${WRKSRC} ${MAKE_CMD} -C ${WRKSRC} runtest
+	@(cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
+		${DO_MAKE_BUILD} runtest)
 
 .include <bsd.port.mk>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 602 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20150415/999bd32f/attachment.sig>


More information about the svn-ports-head mailing list