svn commit: r365282 - in head: lib/libifconfig rescue/rescue share/mk

[John Baldwin]

Author: jhb
Date: Wed Sep  2 22:10:08 2020
New Revision: 365282
URL: https://svnweb.freebsd.org/changeset/base/365282

Log:
  libifconfig now depends on libm due to usage of log10().
  
  ld.bfd in particular requires -lm to come after libifconfig on the
  command line when linking rescue.
  
  Reviewed by:	freqlabs, adrian
  Differential Revision:	https://reviews.freebsd.org/D26258

Modified:
  head/lib/libifconfig/Makefile
  head/rescue/rescue/Makefile
  head/share/mk/src.libnames.mk

Modified: head/lib/libifconfig/Makefile
==============================================================================
--- head/lib/libifconfig/Makefile	Wed Sep  2 21:36:55 2020	(r365281)
+++ head/lib/libifconfig/Makefile	Wed Sep  2 22:10:08 2020	(r365282)
@@ -4,6 +4,8 @@ PACKAGE=	lib${LIB}
 LIB=		ifconfig
 INTERNALLIB=	true
 
+LIBADD=		m
+
 SHLIBDIR?=	/lib
 SHLIB_MAJOR=	1
 SRCS=		libifconfig.c \

Modified: head/rescue/rescue/Makefile
==============================================================================
--- head/rescue/rescue/Makefile	Wed Sep  2 21:36:55 2020	(r365281)
+++ head/rescue/rescue/Makefile	Wed Sep  2 22:10:08 2020	(r365282)
@@ -222,10 +222,11 @@ CRUNCH_PROGS_usr.sbin+= chroot
 CRUNCH_PROGS_usr.sbin+= chown
 CRUNCH_ALIAS_chown= chgrp
 ##################################################################
-CRUNCH_LIBS+= -lm
 
 CRUNCH_LIBS+=		${OBJTOP}/lib/libifconfig/libifconfig.a
 CRUNCH_BUILDOPTS+=	CRUNCH_CFLAGS+=-I${OBJTOP}/lib/libifconfig
+
+CRUNCH_LIBS+= -lm
 
 .if ${MK_ISCSI} != "no"
 CRUNCH_PROGS_usr.bin+=	iscsictl

Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk	Wed Sep  2 21:36:55 2020	(r365281)
+++ head/share/mk/src.libnames.mk	Wed Sep  2 22:10:08 2020	(r365282)
@@ -390,6 +390,7 @@ _DP_zpool=	md pthread z icp spl nvpair avl umem
 _DP_zutil=	avl tpool
 _DP_be=		zfs spl nvpair
 _DP_netmap=
+_DP_ifconfig=	m
 
 # OFED support
 .if ${MK_OFED} != "no"