git: 47404d1d98ac - main - bsdbox: fix the build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 21 Apr 2025 03:45:25 UTC
The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=47404d1d98ac1e0fdba1ae33e41838ff4c450d2b commit 47404d1d98ac1e0fdba1ae33e41838ff4c450d2b Author: Kyle Evans <kevans@FreeBSD.org> AuthorDate: 2025-04-21 03:44:52 +0000 Commit: Kyle Evans <kevans@FreeBSD.org> CommitDate: 2025-04-21 03:45:00 +0000 bsdbox: fix the build hostapd is removed for now because it's a little less trivial with recent wpa architecture. The rest is adopting to ncurses and ifconfig changes, as well as a switch in PIE default. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D42498 --- tools/bsdbox/Makefile | 7 ++++--- tools/bsdbox/Makefile.base | 3 +++ tools/bsdbox/Makefile.net | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/bsdbox/Makefile b/tools/bsdbox/Makefile index a164ddf54cbd..37d6318ccbb3 100644 --- a/tools/bsdbox/Makefile +++ b/tools/bsdbox/Makefile @@ -2,6 +2,7 @@ MAN= .include <bsd.own.mk> MK_SSP= no +MK_PIE= no PROG= bsdbox BINDIR?=/sbin @@ -52,7 +53,7 @@ CRUNCH_SRCDIRS+= bin # setuid binaries - they use these libraries. PAM needs to be # built dynamically or it tries to build _all_ of the modules # statically - and that ends very badly. -CRUNCH_SHLIBS+= -lc -lutil -lcrypt -lxo -lgpio +CRUNCH_SHLIBS+= -lc -lsys -lutil -lcrypt -lxo -lgpio CRUNCH_LIBS+= -lkvm -lmemstat -lnetgraph CRUNCH_LIBS+= -lcrypt -ledit -ltermcapw @@ -69,7 +70,7 @@ CRUNCH_SRCDIRS+= sbin 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 @@ -93,7 +94,7 @@ CRUNCH_LIBS+= -lm .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 index 49f31b421098..8dfc2c50c68c 100644 --- a/tools/bsdbox/Makefile.base +++ b/tools/bsdbox/Makefile.base @@ -9,6 +9,8 @@ CRUNCH_PROGS_bin+= ln rm kenv mv expr 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 @@ CRUNCH_LIBS+= -lprivatezstd -lthr # 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 index 960bc8a25335..d0f7654c41d7 100644 --- a/tools/bsdbox/Makefile.net +++ b/tools/bsdbox/Makefile.net @@ -20,6 +20,7 @@ CRUNCH_LIBS+= -lmemstat -lnetgraph # ifconfig CRUNCH_PROGS_sbin+= ifconfig +CRUNCH_LIBS_ifconfig+= ${LIBNV} CRUNCH_SHLIBS+= -l80211 # wlan stuff