svn commit: r291600 - in head: lib/lib80211 share/mk

[Bryan Drewery]

On 12/1/2015 9:38 AM, Bryan Drewery wrote:
> Author: bdrewery
> Date: Tue Dec  1 17:38:52 2015
> New Revision: 291600
> URL: https://svnweb.freebsd.org/changeset/base/291600
> 
> Log:
>   Fix underlinking in lib80211 and define static dependencies in src.libnames.mk
>   so NO_SHARED works properly.
>   
>   Reported by:	Manfred Antar <null at pozo.com>
>   Sponsored by:	EMC / Isilon Storage Division
> 
> Modified:
>   head/lib/lib80211/Makefile
>   head/share/mk/src.libnames.mk
> 
> Modified: head/lib/lib80211/Makefile
> ==============================================================================
> --- head/lib/lib80211/Makefile	Tue Dec  1 17:31:22 2015	(r291599)
> +++ head/lib/lib80211/Makefile	Tue Dec  1 17:38:52 2015	(r291600)
> @@ -8,6 +8,8 @@ SRCS=	lib80211_regdomain.c lib80211_ioct
>  INCSDIR=	${INCLUDEDIR}/lib80211
>  INCS=	lib80211_regdomain.h lib80211_ioctl.h
>  
> +LIBADD= sbuf bsdxml
> +

I have a branch in progress to automatically detect underlinking like
this. I did so at Isilon for internal libraries, but not FreeBSD
libraries. Doing so for FreeBSD has become a massive effort just as it
was for Isilon's internal libraries. There's a lot of cyclic
dependencies and libraries missing from src.libnames.mk.

>  MAN=	lib80211.3
>  
>  CFLAGS+=-I${.CURDIR}
> 
> Modified: head/share/mk/src.libnames.mk
> ==============================================================================
> --- head/share/mk/src.libnames.mk	Tue Dec  1 17:31:22 2015	(r291599)
> +++ head/share/mk/src.libnames.mk	Tue Dec  1 17:38:52 2015	(r291600)
> @@ -162,6 +162,7 @@ _LIBRARIES=	\
>  		ypclnt \
>  		z
>  
> +_DP_80211=	sbuf bsdxml

I am adding a sanity check in src.libnames.mk for this to assert that
the _DP_{lib} matches the lib's LIBADD.

I consider the _DP_{lib} entries to be a bad hack but it's what we're
stuck with for now until something better comes along.

>  _DP_archive=	z bz2 lzma bsdxml
>  .if ${MK_OPENSSL} != "no"
>  _DP_archive+=	crypto
> 


-- 
Regards,
Bryan Drewery

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20151201/7475951d/attachment.bin>