Date: Thu, 2 Jan 2020 04:34:22 +0000 (UTC) From: Brandon Bergren <bdragon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356266 - in head/stand: . libofw ofw powerpc/ofw sparc64/loader Message-ID: <202001020434.0024YMh5063126@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdragon Date: Thu Jan 2 04:34:22 2020 New Revision: 356266 URL: https://svnweb.freebsd.org/changeset/base/356266 Log: Move stand/ofw/libofw to stand/libofw. Since rS330365, there has been no particular reason for libofw to be in a subdirectory of ofw. Move libofw up a level to make it fit in better with the other top level libraries. Also add a LIBOFWSRC to stand/defs.mk to match what all the other libraries are doing. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D23000 Added: head/stand/libofw/ - copied from r356265, head/stand/ofw/libofw/ Deleted: head/stand/ofw/ Modified: head/stand/Makefile head/stand/defs.mk head/stand/powerpc/ofw/Makefile head/stand/sparc64/loader/Makefile Modified: head/stand/Makefile ============================================================================== --- head/stand/Makefile Thu Jan 2 03:25:37 2020 (r356265) +++ head/stand/Makefile Thu Jan 2 04:34:22 2020 (r356266) @@ -16,7 +16,7 @@ S.${MK_FORTH}+= forth S.${MK_LOADER_LUA}+= liblua S.${MK_LOADER_LUA}+= lua S.${MK_FDT}+= fdt -S.${MK_LOADER_OFW}+= ofw +S.${MK_LOADER_OFW}+= libofw S.yes+= defaults S.yes+= man Modified: head/stand/defs.mk ============================================================================== --- head/stand/defs.mk Thu Jan 2 03:25:37 2020 (r356265) +++ head/stand/defs.mk Thu Jan 2 04:34:22 2020 (r356266) @@ -28,6 +28,7 @@ FDTSRC= ${BOOTSRC}/fdt FICLSRC= ${BOOTSRC}/ficl LDRSRC= ${BOOTSRC}/common LIBLUASRC= ${BOOTSRC}/liblua +LIBOFWSRC= ${BOOTSRC}/libofw LUASRC= ${SRCTOP}/contrib/lua/src SASRC= ${BOOTSRC}/libsa SYSDIR= ${SRCTOP}/sys Modified: head/stand/powerpc/ofw/Makefile ============================================================================== --- head/stand/powerpc/ofw/Makefile Thu Jan 2 03:25:37 2020 (r356265) +++ head/stand/powerpc/ofw/Makefile Thu Jan 2 04:34:22 2020 (r356266) @@ -44,8 +44,8 @@ CFLAGS+= -DRELOC=${RELOC} -g LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc # Open Firmware standalone support library -LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a -CFLAGS+= -I${BOOTSRC}/ofw/libofw +LIBOFW= ${BOOTOBJ}/libofw/libofw.a +CFLAGS+= -I${BOOTSRC}/libofw DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA} LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA} Modified: head/stand/sparc64/loader/Makefile ============================================================================== --- head/stand/sparc64/loader/Makefile Thu Jan 2 03:25:37 2020 (r356265) +++ head/stand/sparc64/loader/Makefile Thu Jan 2 04:34:22 2020 (r356266) @@ -47,8 +47,8 @@ LINKS= ${BINDIR}/loader ${BINDIR}/zfsloader .endif # Open Firmware standalone support library -LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a -CFLAGS+= -I${BOOTSRC}/ofw/libofw/ +LIBOFW= ${BOOTOBJ}/libofw/libofw.a +CFLAGS+= -I${BOOTSRC}/libofw DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBSA} LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBSA}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001020434.0024YMh5063126>