svn commit: r310475 - projects/ipsec/sys/conf
Andrey V. Elsukov
ae at FreeBSD.org
Fri Dec 23 12:11:58 UTC 2016
Author: ae
Date: Fri Dec 23 12:11:56 2016
New Revision: 310475
URL: https://svnweb.freebsd.org/changeset/base/310475
Log:
Unconditionally build machine depended crypto(4) code when
IPSEC_SUPPORT is enabled.
Modified:
projects/ipsec/sys/conf/files.amd64
projects/ipsec/sys/conf/files.arm
projects/ipsec/sys/conf/files.arm64
projects/ipsec/sys/conf/files.i386
projects/ipsec/sys/conf/files.mips
projects/ipsec/sys/conf/files.pc98
projects/ipsec/sys/conf/files.powerpc
projects/ipsec/sys/conf/files.riscv
projects/ipsec/sys/conf/files.sparc64
Modified: projects/ipsec/sys/conf/files.amd64
==============================================================================
--- projects/ipsec/sys/conf/files.amd64 Fri Dec 23 11:45:33 2016 (r310474)
+++ projects/ipsec/sys/conf/files.amd64 Fri Dec 23 12:11:56 2016 (r310475)
@@ -180,8 +180,9 @@ aesni_wrap.o optional aesni \
compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${NO_WCAST_QUAL} ${PROF} -mmmx -msse -msse4 -maes ${.IMPSRC}" \
no-implicit-rule \
clean "aesni_wrap.o"
-crypto/blowfish/bf_enc.c optional crypto | ipsec
-crypto/des/des_enc.c optional crypto | ipsec | netsmb
+crypto/blowfish/bf_enc.c optional crypto | ipsec | ipsec_support
+crypto/des/des_enc.c optional crypto | ipsec | \
+ ipsec_support | netsmb
crypto/via/padlock.c optional padlock
crypto/via/padlock_cipher.c optional padlock
crypto/via/padlock_hash.c optional padlock
Modified: projects/ipsec/sys/conf/files.arm
==============================================================================
--- projects/ipsec/sys/conf/files.arm Fri Dec 23 11:45:33 2016 (r310474)
+++ projects/ipsec/sys/conf/files.arm Fri Dec 23 12:11:56 2016 (r310475)
@@ -112,8 +112,8 @@ cddl/compat/opensolaris/kern/opensolaris
cddl/dev/dtrace/arm/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}"
cddl/dev/dtrace/arm/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}"
cddl/dev/fbt/arm/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}"
-crypto/blowfish/bf_enc.c optional crypto | ipsec
-crypto/des/des_enc.c optional crypto | ipsec | netsmb
+crypto/blowfish/bf_enc.c optional crypto | ipsec | ipsec_support
+crypto/des/des_enc.c optional crypto | ipsec | ipsec_support | netsmb
dev/cpufreq/cpufreq_dt.c optional cpufreq fdt
dev/dwc/if_dwc.c optional dwc
dev/dwc/if_dwc_if.m optional dwc
Modified: projects/ipsec/sys/conf/files.arm64
==============================================================================
--- projects/ipsec/sys/conf/files.arm64 Fri Dec 23 11:45:33 2016 (r310474)
+++ projects/ipsec/sys/conf/files.arm64 Fri Dec 23 12:11:56 2016 (r310475)
@@ -142,8 +142,8 @@ armv8_crypto_wrap.o optional armv8crypt
compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} ${WERROR} ${NO_WCAST_QUAL} ${PROF} -march=armv8a+crypto ${.IMPSRC}" \
no-implicit-rule \
clean "armv8_crypto_wrap.o"
-crypto/blowfish/bf_enc.c optional crypto | ipsec
-crypto/des/des_enc.c optional crypto | ipsec | netsmb
+crypto/blowfish/bf_enc.c optional crypto | ipsec | ipsec_support
+crypto/des/des_enc.c optional crypto | ipsec | ipsec_support | netsmb
dev/acpica/acpi_if.m optional acpi
dev/ahci/ahci_generic.c optional ahci fdt
dev/cpufreq/cpufreq_dt.c optional cpufreq fdt
Modified: projects/ipsec/sys/conf/files.i386
==============================================================================
--- projects/ipsec/sys/conf/files.i386 Fri Dec 23 11:45:33 2016 (r310474)
+++ projects/ipsec/sys/conf/files.i386 Fri Dec 23 12:11:56 2016 (r310475)
@@ -143,7 +143,7 @@ compat/svr4/svr4_syscallnames.c optional
compat/svr4/svr4_sysent.c optional compat_svr4
compat/svr4/svr4_sysvec.c optional compat_svr4
compat/svr4/svr4_termios.c optional compat_svr4
-bf_enc.o optional crypto | ipsec \
+bf_enc.o optional crypto | ipsec | ipsec_support \
dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \
compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
no-implicit-rule
@@ -159,7 +159,7 @@ aesni_wrap.o optional aesni \
compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${NO_WCAST_QUAL} ${PROF} -mmmx -msse -msse4 -maes ${.IMPSRC}" \
no-implicit-rule \
clean "aesni_wrap.o"
-crypto/des/arch/i386/des_enc.S optional crypto | ipsec | netsmb
+crypto/des/arch/i386/des_enc.S optional crypto | ipsec | ipsec_support | netsmb
crypto/via/padlock.c optional padlock
crypto/via/padlock_cipher.c optional padlock
crypto/via/padlock_hash.c optional padlock
Modified: projects/ipsec/sys/conf/files.mips
==============================================================================
--- projects/ipsec/sys/conf/files.mips Fri Dec 23 11:45:33 2016 (r310474)
+++ projects/ipsec/sys/conf/files.mips Fri Dec 23 12:11:56 2016 (r310475)
@@ -82,8 +82,10 @@ mips/mips/sc_machdep.c optional sc
dev/uart/uart_cpu_fdt.c optional uart fdt
# crypto support -- use generic
-crypto/blowfish/bf_enc.c optional crypto | ipsec
-crypto/des/des_enc.c optional crypto | ipsec | netsmb
+crypto/blowfish/bf_enc.c optional crypto | ipsec | \
+ ipsec_support
+crypto/des/des_enc.c optional crypto | ipsec | \
+ ipsec_support | netsmb
# AP common nvram interface MIPS specific, but maybe should be more generic
dev/nvram2env/nvram2env_mips.c optional nvram2env
Modified: projects/ipsec/sys/conf/files.pc98
==============================================================================
--- projects/ipsec/sys/conf/files.pc98 Fri Dec 23 11:45:33 2016 (r310474)
+++ projects/ipsec/sys/conf/files.pc98 Fri Dec 23 12:11:56 2016 (r310475)
@@ -90,11 +90,13 @@ compat/svr4/svr4_syscallnames.c optional
compat/svr4/svr4_sysent.c optional compat_svr4
compat/svr4/svr4_sysvec.c optional compat_svr4
compat/svr4/svr4_termios.c optional compat_svr4
-bf_enc.o optional crypto | ipsec \
+bf_enc.o optional crypto | ipsec |\
+ ipsec_support \
dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \
compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
no-implicit-rule
-crypto/des/arch/i386/des_enc.S optional crypto | ipsec | netsmb
+crypto/des/arch/i386/des_enc.S optional crypto | ipsec | \
+ ipsec_support | netsmb
dev/agp/agp_ali.c optional agp
dev/agp/agp_amd.c optional agp
dev/agp/agp_i810.c optional agp
Modified: projects/ipsec/sys/conf/files.powerpc
==============================================================================
--- projects/ipsec/sys/conf/files.powerpc Fri Dec 23 11:45:33 2016 (r310474)
+++ projects/ipsec/sys/conf/files.powerpc Fri Dec 23 12:11:56 2016 (r310475)
@@ -20,8 +20,8 @@ cddl/contrib/opensolaris/common/atomic/p
cddl/dev/dtrace/powerpc/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}"
cddl/dev/dtrace/powerpc/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}"
cddl/dev/fbt/powerpc/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}"
-crypto/blowfish/bf_enc.c optional crypto | ipsec
-crypto/des/des_enc.c optional crypto | ipsec | netsmb
+crypto/blowfish/bf_enc.c optional crypto | ipsec | ipsec_support
+crypto/des/des_enc.c optional crypto | ipsec | ipsec_support | netsmb
dev/bm/if_bm.c optional bm powermac
dev/adb/adb_bus.c optional adb
dev/adb/adb_kbd.c optional adb
Modified: projects/ipsec/sys/conf/files.riscv
==============================================================================
--- projects/ipsec/sys/conf/files.riscv Fri Dec 23 11:45:33 2016 (r310474)
+++ projects/ipsec/sys/conf/files.riscv Fri Dec 23 12:11:56 2016 (r310475)
@@ -3,8 +3,8 @@ cddl/compat/opensolaris/kern/opensolaris
cddl/dev/dtrace/riscv/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}"
cddl/dev/dtrace/riscv/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}"
cddl/dev/fbt/riscv/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}"
-crypto/blowfish/bf_enc.c optional crypto | ipsec
-crypto/des/des_enc.c optional crypto | ipsec | netsmb
+crypto/blowfish/bf_enc.c optional crypto | ipsec | ipsec_support
+crypto/des/des_enc.c optional crypto | ipsec | ipsec_support | netsmb
dev/ofw/ofw_cpu.c optional fdt
dev/uart/uart_cpu_fdt.c optional uart fdt
dev/xilinx/axi_quad_spi.c optional xilinx_spi
Modified: projects/ipsec/sys/conf/files.sparc64
==============================================================================
--- projects/ipsec/sys/conf/files.sparc64 Fri Dec 23 11:45:33 2016 (r310474)
+++ projects/ipsec/sys/conf/files.sparc64 Fri Dec 23 12:11:56 2016 (r310475)
@@ -23,8 +23,8 @@ ukbdmap.h optional ukbd_dflt_keymap \
clean "ukbdmap.h"
#
cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S optional zfs compile-with "${ZFS_S}"
-crypto/blowfish/bf_enc.c optional crypto | ipsec
-crypto/des/des_enc.c optional crypto | ipsec | netsmb
+crypto/blowfish/bf_enc.c optional crypto | ipsec | ipsec_support
+crypto/des/des_enc.c optional crypto | ipsec | ipsec_support | netsmb
dev/atkbdc/atkbd.c optional atkbd atkbdc
dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc
dev/atkbdc/atkbdc.c optional atkbdc
More information about the svn-src-projects
mailing list