Page MenuHomeFreeBSD
Files F106952389

D42498.diff
No OneTemporary
Actions

D42498.diff
View Options

diff --git a/tools/bsdbox/Makefile b/tools/bsdbox/Makefile
--- a/tools/bsdbox/Makefile
+++ b/tools/bsdbox/Makefile
@@ -4,6 +4,7 @@
.include <bsd.own.mk>
MK_SSP= no
+MK_PIE= no
PROG= bsdbox
BINDIR?=/sbin
@@ -71,7 +72,7 @@
CRUNCH_LIBS+= -l80211 -lalias -lcam -lcursesw -ldevstat -lipsec
# Don't forget this - ifconfig, etc -adrian
-CRUNCH_LIBS+= ${LDADD_ifconfig}
+CRUNCH_LIBS+= ${OBJTOP}/lib/libifconfig/libifconfig.a
CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lsbuf -lufs
CRUNCH_BUILDOPTS+= CRUNCH_CFLAGS+=-I${OBJTOP}/lib/libifconfig
@@ -95,7 +96,7 @@
.include "Makefile.base"
.include "Makefile.net"
-.include "Makefile.hostapd"
+#.include "Makefile.hostapd"
#.include "Makefile.textproc"
.include "Makefile.login"
.include "Makefile.kld"
diff --git a/tools/bsdbox/Makefile.base b/tools/bsdbox/Makefile.base
--- a/tools/bsdbox/Makefile.base
+++ b/tools/bsdbox/Makefile.base
@@ -9,6 +9,8 @@
CRUNCH_PROGS_usr.bin+= true false hexdump tail nc w head uname tset
CRUNCH_PROGS_usr.sbin+= gpioctl
CRUNCH_ALIAS_w= uptime
+
+CRUNCH_SRCDIR_tset= ${SRCTOP}/usr.bin/ncurses
CRUNCH_ALIAS_tset= reset
CRUNCH_PROGS_usr.bin+= vmstat
@@ -23,6 +25,7 @@
# Clear requires tput, and it's a shell script so it won't be crunched
CRUNCH_PROGS_usr.bin+= tput
+CRUNCH_SRCDIR_tput= ${SRCTOP}/usr.bin/ncurses
# sh
CRUNCH_PROGS_bin+= sh
diff --git a/tools/bsdbox/Makefile.net b/tools/bsdbox/Makefile.net
--- a/tools/bsdbox/Makefile.net
+++ b/tools/bsdbox/Makefile.net
@@ -20,6 +20,7 @@
# ifconfig
CRUNCH_PROGS_sbin+= ifconfig
+CRUNCH_LIBS_ifconfig+= ${LIBNV}
CRUNCH_SHLIBS+= -l80211
# wlan stuff

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 8, 11:59 PM (3 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15727458
Default Alt Text
D42498.diff (1 KB)

Event Timeline