Author: imp
Date: Sun Feb 2 08:27:26 2020
New Revision: 357401
URL: https://svnweb.freebsd.org/changeset/base/357401
Log:
Move font.h generation to conf/files from conf/files.*
Use ${SRCTOP} instead of /usr/share.
Prefer to depend on option sc_dflt_fnt instead of sc.
gc the 4 otherwise identical instances in the tree.
Platforms that don't need this won't included it.
Modified:
head/sys/conf/files
head/sys/conf/files.amd64
head/sys/conf/files.arm
head/sys/conf/files.i386
head/sys/conf/files.powerpc
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Sun Feb 2 08:27:20 2020 (r357400)
+++ head/sys/conf/files Sun Feb 2 08:27:26 2020 (r357401)
@@ -34,6 +34,10 @@ feeder_rate_gen.h optional sound
\
compile-with "${AWK} -f $S/tools/sound/feeder_rate_mkfilter.awk --
${FEEDER_RATE_PRESETS} > feeder_rate_gen.h" \
no-obj no-implicit-rule before-depend \
clean "feeder_rate_gen.h"
+font.h optional sc_dflt_font \
+ compile-with "uudecode <
${SRCTOP}/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char
dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode <
${SRCTOP}/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char
dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode <
${SRCTOP}/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char
dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h"
\
+ no-obj no-implicit-rule before-depend \
+ clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16
${SC_DFLT_FONT}-8x8"
snd_fxdiv_gen.h optional sound
\
dependency "$S/tools/sound/snd_fxdiv_gen.awk" \
compile-with "${AWK} -f $S/tools/sound/snd_fxdiv_gen.awk -- >
snd_fxdiv_gen.h" \
Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64 Sun Feb 2 08:27:20 2020 (r357400)
+++ head/sys/conf/files.amd64 Sun Feb 2 08:27:26 2020 (r357401)
@@ -72,11 +72,6 @@ ia32_assym.h standard
\
no-obj no-implicit-rule before-depend \
clean "ia32_assym.h"
#
-font.h optional sc_dflt_font \
- compile-with "uudecode <
/usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char
dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode <
/usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char
dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode <
/usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char
dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h"
\
- no-obj no-implicit-rule before-depend \
- clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16
${SC_DFLT_FONT}-8x8"
-#
amd64/acpica/acpi_machdep.c optional acpi
acpi_wakecode.o optional acpi
\
dependency "$S/amd64/acpica/acpi_wakecode.S assym.inc" \
Modified: head/sys/conf/files.arm
==============================================================================
--- head/sys/conf/files.arm Sun Feb 2 08:27:20 2020 (r357400)
+++ head/sys/conf/files.arm Sun Feb 2 08:27:26 2020 (r357401)
@@ -112,10 +112,6 @@ dev/psci/smccc_arm.S optional psci
dev/syscons/scgfbrndr.c optional sc
dev/uart/uart_cpu_fdt.c optional uart fdt
-font.h optional sc \
- compile-with "uudecode <
/usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char
dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode <
/usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char
dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode <
/usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char
dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \
- no-obj no-implicit-rule before-depend \
- clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16
${SC_DFLT_FONT}-8x8"
kern/msi_if.m optional intrng
kern/pic_if.m optional intrng
kern/subr_busdma_bufalloc.c standard
Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386 Sun Feb 2 08:27:20 2020 (r357400)
+++ head/sys/conf/files.i386 Sun Feb 2 08:27:26 2020 (r357401)
@@ -47,11 +47,6 @@ linux_vdso.so optional
compat_linux \
no-implicit-rule \
clean "linux_vdso.so"
#
-font.h optional sc_dflt_font \
- compile-with "uudecode <
/usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char
dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode <
/usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char
dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode <
/usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char
dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h"
\
- no-obj no-implicit-rule before-depend \
- clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16
${SC_DFLT_FONT}-8x8"
-#
cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S
optional zfs | dtrace compile-with "${ZFS_S}"
cddl/dev/dtrace/i386/dtrace_asm.S optional dtrace
compile-with "${DTRACE_S}"
cddl/dev/dtrace/i386/dtrace_subr.c optional dtrace
compile-with "${DTRACE_C}"
Modified: head/sys/conf/files.powerpc
==============================================================================
--- head/sys/conf/files.powerpc Sun Feb 2 08:27:20 2020 (r357400)
+++ head/sys/conf/files.powerpc Sun Feb 2 08:27:26 2020 (r357401)
@@ -9,11 +9,6 @@
#
#
-font.h optional sc \
- compile-with "uudecode <
/usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char
dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode <
/usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char
dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode <
/usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char
dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \
- no-obj no-implicit-rule before-depend \
- clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16
${SC_DFLT_FONT}-8x8"
-#
# There is only an asm version on ppc64.
cddl/compat/opensolaris/kern/opensolaris_atomic.c
optional zfs powerpc | dtrace powerpc | zfs powerpcspe | dtrace powerpcspe
compile-with "${ZFS_C}"
cddl/dev/dtrace/powerpc/dtrace_asm.S optional dtrace compile-with
"${DTRACE_S}"
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
