diff options
| -rw-r--r-- | ObsoleteFiles.inc | 5 | ||||
| -rw-r--r-- | lib/Makefile | 1 | ||||
| -rw-r--r-- | share/mk/bsd.libnames.mk | 1 | ||||
| -rw-r--r-- | sys/boot/Makefile | 1 | ||||
| -rw-r--r-- | sys/boot/Makefile.inc | 2 | ||||
| -rw-r--r-- | sys/boot/libsa/Makefile | 14 |
6 files changed, 21 insertions, 3 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index d862455..1947862 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,11 @@ # xargs -n1 | sort | uniq -d; # done +# 20180222: Remove libstand +OLD_FILES+=usr/lib/libstand.a +OLD_FILES+=usr/lib/libstand_p.a +OLD_FILES+=usr/include/stand.h +OLD_FILES+=usr/share/man/man3/libstand.3 # 20180202: Convert geli(8) tests to ATF OLD_FILES+=tests/sys/geom/class/eli/nokey_test.sh OLD_FILES+=tests/sys/geom/class/eli/readonly_test.sh diff --git a/lib/Makefile b/lib/Makefile index 42ed476..91a88e9 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -98,7 +98,6 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ ${_libsmdb} \ ${_libsmutil} \ libsqlite3 \ - libstand \ libstdbuf \ libstdthreads \ libsysdecode \ diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index c0b2ce4..28be843 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -138,7 +138,6 @@ LIBSDP?= ${DESTDIR}${LIBDIR_BASE}/libsdp.a LIBSMB?= ${DESTDIR}${LIBDIR_BASE}/libsmb.a LIBSSL?= ${DESTDIR}${LIBDIR_BASE}/libssl.a LIBSSP_NONSHARED?= ${DESTDIR}${LIBDIR_BASE}/libssp_nonshared.a -LIBSTAND?= ${DESTDIR}${LIBDIR_BASE}/libstand.a LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR_BASE}/libstdc++.a LIBSTDTHREADS?= ${DESTDIR}${LIBDIR_BASE}/libstdthreads.a LIBSYSDECODE?= ${DESTDIR}${LIBDIR_BASE}/libsysdecode.a diff --git a/sys/boot/Makefile b/sys/boot/Makefile index 2607651..30baed2 100644 --- a/sys/boot/Makefile +++ b/sys/boot/Makefile @@ -2,6 +2,7 @@ .include <src.opts.mk> +SUBDIR+= libsa .if ${MK_FORTH} != "no" # Build the add-in FORTH interpreter. SUBDIR+= ficl diff --git a/sys/boot/Makefile.inc b/sys/boot/Makefile.inc index 7e6439a..55d2632 100644 --- a/sys/boot/Makefile.inc +++ b/sys/boot/Makefile.inc @@ -7,7 +7,7 @@ __BOOT_MAKEFILE_INC__=${MFILE} SASRC=${SRCTOP}/lib/libstand # Normal stand alone library -LIBSA=${OBJTOP}/lib/libstand/libstand.a +LIBSA=${OBJTOP}/sys/boot/libsa/libstand.a # stand alone library compiled for 32-bit version of the processor LIBSA32=${OBJTOP}/sys/boot/libstand32/libstand.a # stand along library compiled for userboot diff --git a/sys/boot/libsa/Makefile b/sys/boot/libsa/Makefile new file mode 100644 index 0000000..5b73979 --- /dev/null +++ b/sys/boot/libsa/Makefile @@ -0,0 +1,14 @@ +# $FreeBSD$ + +.include <src.opts.mk> + +.include "../Makefile.inc" + +LIBSTAND_SRC= ${SASRC} +LIBC_SRC= ${SRCTOP}/lib/libc +INTERNALLIB= +INCS= +MAN= +.PATH: ${SASRC} + +.include "${SASRC}/Makefile" |
