svn commit: r273065 - in head: lib lib/libevent share/mk usr.sbin/ftp-proxy usr.sbin/ftp-proxy/ftp-proxy usr.sbin/ftp-proxy/libevent

[Baptiste Daroussin]

On Mon, Oct 13, 2014 at 10:15:26PM +0000, Xin LI wrote:
> Author: delphij
> Date: Mon Oct 13 22:15:26 2014
> New Revision: 273065
> URL: https://svnweb.freebsd.org/changeset/base/273065
> 
> Log:
>   Promote libevent to lib/ level and fold ftp-proxy into its parent Makefile.
>   This allows us to use libevent for other application in the future.
>   
>   For now libevent is still INTERNALLIB and no shared library is installed.
>   
>   MFC after:	1 month
> 
> Added:
>   head/lib/libevent/
>      - copied from r273060, head/usr.sbin/ftp-proxy/libevent/
> Deleted:
>   head/usr.sbin/ftp-proxy/Makefile.inc
>   head/usr.sbin/ftp-proxy/ftp-proxy/
>   head/usr.sbin/ftp-proxy/libevent/
> Modified:
>   head/lib/Makefile
>   head/lib/libevent/Makefile
>   head/share/mk/src.libnames.mk
>   head/usr.sbin/ftp-proxy/Makefile
> 
> Modified: head/lib/Makefile
> ==============================================================================
> --- head/lib/Makefile	Mon Oct 13 21:08:27 2014	(r273064)
> +++ head/lib/Makefile	Mon Oct 13 22:15:26 2014	(r273065)
> @@ -44,6 +44,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
>  	libdevstat \
>  	libdwarf \
>  	libedit \
> +	${_libevent} \
>  	libexecinfo \
>  	libexpat \
>  	libfetch \
> @@ -226,6 +227,10 @@ _libnetgraph=	libnetgraph
>  _libypclnt=	libypclnt
>  .endif
>  
> +.if ${MK_PF} != "no"
> +_libevent=	libevent
> +.endif
> +
>  .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
>  _libsmb=	libsmb
>  _libvgl=	libvgl
> 
> Modified: head/lib/libevent/Makefile
> ==============================================================================
> --- head/usr.sbin/ftp-proxy/libevent/Makefile	Mon Oct 13 20:39:51 2014	(r273060)
> +++ head/lib/libevent/Makefile	Mon Oct 13 22:15:26 2014	(r273065)
> @@ -1,10 +1,14 @@
>  # $FreeBSD$
>  
> -.PATH:	${.CURDIR}/../../../contrib/pf/libevent
> +.PATH:	${.CURDIR}/../../contrib/pf/libevent
>  
> +.include <src.opts.mk>
> +
> +LIB=		event
> +SHLIB_MAJOR=	1
> +PRIVATELIB=
> +INTERNALLIB=

Both PRIVATELIB and INTERNALLIB looks wrong I think you only want PRIVATELIB

regards,
Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20141014/b9842f5b/attachment.sig>