Date: Wed, 24 Jun 2015 17:17:54 GMT From: clord@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287541 - in soc2015/clord/head/sys/boot: arm/uboot efi/loader mips/beri/loader pc98/loader powerpc/kboot powerpc/ofw powerpc/ps3 powerpc/uboot sparc64/loader userboot/ficl userboot/... Message-ID: <201506241717.t5OHHsOD015413@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: clord Date: Wed Jun 24 17:17:53 2015 New Revision: 287541 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287541 Log: Change paths to ficl sources to reflect new location in sys/contrib/ficl. Modified: soc2015/clord/head/sys/boot/arm/uboot/Makefile soc2015/clord/head/sys/boot/efi/loader/Makefile soc2015/clord/head/sys/boot/mips/beri/loader/Makefile soc2015/clord/head/sys/boot/pc98/loader/Makefile soc2015/clord/head/sys/boot/powerpc/kboot/Makefile soc2015/clord/head/sys/boot/powerpc/ofw/Makefile soc2015/clord/head/sys/boot/powerpc/ps3/Makefile soc2015/clord/head/sys/boot/powerpc/uboot/Makefile soc2015/clord/head/sys/boot/sparc64/loader/Makefile soc2015/clord/head/sys/boot/userboot/ficl/Makefile soc2015/clord/head/sys/boot/userboot/userboot/Makefile Modified: soc2015/clord/head/sys/boot/arm/uboot/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/arm/uboot/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/arm/uboot/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -82,7 +82,7 @@ .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/arm +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../contrib/ficl -I${.CURDIR}/../../../contrib/ficl/arm LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: soc2015/clord/head/sys/boot/efi/loader/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/efi/loader/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/efi/loader/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -47,8 +47,8 @@ .if ${MK_FORTH} != "no" BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH -CFLAGS+= -I${.CURDIR}/../../ficl -CFLAGS+= -I${.CURDIR}/../../ficl/${MACHINE_CPUARCH} +CFLAGS+= -I${.CURDIR}/../../../contrib/ficl +CFLAGS+= -I${.CURDIR}/../../../contrib/ficl/${MACHINE_CPUARCH} LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: soc2015/clord/head/sys/boot/mips/beri/loader/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/mips/beri/loader/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/mips/beri/loader/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -71,8 +71,8 @@ .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../ficl -CFLAGS+= -I${.CURDIR}/../../../ficl/mips +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../../contrib/ficl +CFLAGS+= -I${.CURDIR}/../../../../contrib/ficl/mips LIBFICL= ${.OBJDIR}/../../../ficl/libficl.a .endif Modified: soc2015/clord/head/sys/boot/pc98/loader/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/pc98/loader/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/pc98/loader/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -30,7 +30,7 @@ .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386 +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../contrib/ficl -I${.CURDIR}/../../../contrib/ficl/i386 LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: soc2015/clord/head/sys/boot/powerpc/kboot/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/powerpc/kboot/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/powerpc/kboot/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -64,7 +64,7 @@ .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../contrib/ficl -I${.CURDIR}/../../../contrib/ficl/powerpc LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: soc2015/clord/head/sys/boot/powerpc/ofw/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/powerpc/ofw/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/powerpc/ofw/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -63,7 +63,7 @@ .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../contrib/ficl -I${.CURDIR}/../../../contrib/ficl/powerpc LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: soc2015/clord/head/sys/boot/powerpc/ps3/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/powerpc/ps3/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/powerpc/ps3/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -64,7 +64,7 @@ .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../contrib/ficl -I${.CURDIR}/../../../contrib/ficl/powerpc LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: soc2015/clord/head/sys/boot/powerpc/uboot/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/powerpc/uboot/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/powerpc/uboot/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -69,7 +69,7 @@ .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../contrib/ficl -I${.CURDIR}/../../../contrib/ficl/powerpc LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: soc2015/clord/head/sys/boot/sparc64/loader/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/sparc64/loader/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/sparc64/loader/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -59,8 +59,8 @@ .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -CFLAGS+= -I${.CURDIR}/../../ficl/sparc64 +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../contrib/ficl +CFLAGS+= -I${.CURDIR}/../../../contrib/ficl/sparc64 LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: soc2015/clord/head/sys/boot/userboot/ficl/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/userboot/ficl/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/userboot/ficl/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -3,8 +3,8 @@ .include <bsd.own.mk> MK_SSP= no -.PATH: ${.CURDIR}/../../ficl -.PATH: ${.CURDIR}/../../ficl/${MACHINE_CPUARCH} +.PATH: ${.CURDIR}/../../../contrib/ficl +.PATH: ${.CURDIR}/../../../contrib/ficl/${MACHINE_CPUARCH} BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \ prefix.c search.c stack.c tools.c vm.c words.c @@ -40,7 +40,7 @@ .endif # Standard softwords -.PATH: ${.CURDIR}/../../ficl/softwords +.PATH: ${.CURDIR}/../../../contrib/ficl/softwords SOFTWORDS= softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \ ifbrack.fr # Optional OO extension softwords @@ -54,12 +54,12 @@ CFLAGS+= -m32 -mcpu=powerpc -I. .endif -CFLAGS+= -I${.CURDIR}/../../ficl -CFLAGS+= -I${.CURDIR}/../../ficl/${MACHINE_CPUARCH} +CFLAGS+= -I${.CURDIR}/../../../contrib/ficl +CFLAGS+= -I${.CURDIR}/../../../contrib/ficl/${MACHINE_CPUARCH} CFLAGS+= -I${.CURDIR}/../../common softcore.c: ${SOFTWORDS} softcore.awk - (cd ${.CURDIR}/../../ficl/softwords; cat ${SOFTWORDS} \ + (cd ${.CURDIR}/../../../contrib/ficl/softwords; cat ${SOFTWORDS} \ | awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET} #.if ${MACHINE_CPUARCH} == "amd64" Modified: soc2015/clord/head/sys/boot/userboot/userboot/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/userboot/userboot/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/userboot/userboot/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -45,7 +45,7 @@ .if ${MK_FORTH} != "no" BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386 +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../contrib/ficl -I${.CURDIR}/../../../contrib/ficl/i386 CFLAGS+= -DBF_DICTSIZE=15000 LIBFICL= ${.OBJDIR}/../ficl/libficl.a LIBSTAND= ${.OBJDIR}/../libstand/libstand.a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506241717.t5OHHsOD015413>