From b17cb2b1f32f9d56a9ff134d13162eb0cbb6a953 Mon Sep 17 00:00:00 2001 From: jhb Date: Wed, 2 Sep 2020 22:10:08 +0000 Subject: [PATCH] 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 --- lib/libifconfig/Makefile | 2 ++ rescue/rescue/Makefile | 3 ++- share/mk/src.libnames.mk | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/libifconfig/Makefile b/lib/libifconfig/Makefile index f7d2dbf1c71d..73c5166ffb2c 100644 --- a/lib/libifconfig/Makefile +++ b/lib/libifconfig/Makefile @@ -4,6 +4,8 @@ PACKAGE= lib${LIB} LIB= ifconfig INTERNALLIB= true +LIBADD= m + SHLIBDIR?= /lib SHLIB_MAJOR= 1 SRCS= libifconfig.c \ diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index bda45c7d2884..b468a7827914 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -222,11 +222,12 @@ 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 CRUNCH_PROGS_usr.sbin+= iscsid diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 197f072f979e..8a7768a8318c 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -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"