Date: Sun, 11 Feb 2018 19:33:24 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r329130 - in stable/11: . lib share/mk sys/boot sys/boot/libsa Message-ID: <201802111933.w1BJXOqY005370@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Sun Feb 11 19:33:24 2018 New Revision: 329130 URL: https://svnweb.freebsd.org/changeset/base/329130 Log: MFC Loader Fixes 2017q4p2: r324453, r324454 r324453: Create sys/boot/libsa and build libstand.a there r324454: Disconnect libstand from the build. Added: stable/11/sys/boot/libsa/ - copied from r324453, head/sys/boot/libsa/ Modified: stable/11/ObsoleteFiles.inc stable/11/lib/Makefile stable/11/share/mk/bsd.libnames.mk stable/11/sys/boot/Makefile stable/11/sys/boot/Makefile.inc Directory Properties: stable/11/ (props changed) Modified: stable/11/ObsoleteFiles.inc ============================================================================== --- stable/11/ObsoleteFiles.inc Sun Feb 11 19:29:58 2018 (r329129) +++ stable/11/ObsoleteFiles.inc Sun Feb 11 19:33:24 2018 (r329130) @@ -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 Modified: stable/11/lib/Makefile ============================================================================== --- stable/11/lib/Makefile Sun Feb 11 19:29:58 2018 (r329129) +++ stable/11/lib/Makefile Sun Feb 11 19:33:24 2018 (r329130) @@ -98,7 +98,6 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ ${_libsmdb} \ ${_libsmutil} \ libsqlite3 \ - libstand \ libstdbuf \ libstdthreads \ libsysdecode \ Modified: stable/11/share/mk/bsd.libnames.mk ============================================================================== --- stable/11/share/mk/bsd.libnames.mk Sun Feb 11 19:29:58 2018 (r329129) +++ stable/11/share/mk/bsd.libnames.mk Sun Feb 11 19:33:24 2018 (r329130) @@ -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 Modified: stable/11/sys/boot/Makefile ============================================================================== --- stable/11/sys/boot/Makefile Sun Feb 11 19:29:58 2018 (r329129) +++ stable/11/sys/boot/Makefile Sun Feb 11 19:33:24 2018 (r329130) @@ -2,6 +2,7 @@ .include <src.opts.mk> +SUBDIR+= libsa .if ${MK_FORTH} != "no" # Build the add-in FORTH interpreter. SUBDIR+= ficl Modified: stable/11/sys/boot/Makefile.inc ============================================================================== --- stable/11/sys/boot/Makefile.inc Sun Feb 11 19:29:58 2018 (r329129) +++ stable/11/sys/boot/Makefile.inc Sun Feb 11 19:33:24 2018 (r329130) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802111933.w1BJXOqY005370>