cmhi
/
f-stack
mirror of https://github.com/F-Stack/f-stack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Setting FF_DPDK with MACHINE_CPUARCH

This commit is contained in:
DonBearH 2018-11-08 14:57:44 +08:00 committed by GitHub
parent e404bd1de6
commit 31b03876fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Makefile
View File

@ -23,8 +23,10 @@ FF_KNI=1
#FF_NETGRAPH=1 #FF_NETGRAPH=1
#FF_IPFW=1 #FF_IPFW=1
include ${TOPDIR}/mk/kern.pre.mk
ifeq ($(FF_DPDK),) ifeq ($(FF_DPDK),)
ifeq (${shell uname -m},aarch64) ifeq (${MACHINE_CPUARCH},aarch64)
FF_DPDK=${TOPDIR}/dpdk/build FF_DPDK=${TOPDIR}/dpdk/build
else else
FF_DPDK=${TOPDIR}/dpdk/x86_64-native-linuxapp-gcc FF_DPDK=${TOPDIR}/dpdk/x86_64-native-linuxapp-gcc
@ -32,7 +34,7 @@ endif
endif endif
ifdef RTE_SDK ifdef RTE_SDK
ifeq (${shell uname -m},aarch64) ifeq (${MACHINE_CPUARCH},aarch64)
FF_DPDK=${RTE_SDK}/build FF_DPDK=${RTE_SDK}/build
else else
FF_DPDK=${RTE_SDK}/x86_64-native-linuxapp-gcc FF_DPDK=${RTE_SDK}/x86_64-native-linuxapp-gcc
@ -45,8 +47,6 @@ DPDK_CFLAGS+= -DRTE_MACHINE_CPUFLAG_SSSE3 -DRTE_MACHINE_CPUFLAG_SSE4_1 -DRTE_MAC
DPDK_CFLAGS+= -DRTE_COMPILE_TIME_CPUFLAGS=RTE_CPUFLAG_SSE,RTE_CPUFLAG_SSE2,RTE_CPUFLAG_SSE3,RTE_CPUFLAG_SSSE3,RTE_CPUFLAG_SSE4_1,RTE_CPUFLAG_SSE4_2 DPDK_CFLAGS+= -DRTE_COMPILE_TIME_CPUFLAGS=RTE_CPUFLAG_SSE,RTE_CPUFLAG_SSE2,RTE_CPUFLAG_SSE3,RTE_CPUFLAG_SSSE3,RTE_CPUFLAG_SSE4_1,RTE_CPUFLAG_SSE4_2
DPDK_CFLAGS+= -I${FF_DPDK}/include DPDK_CFLAGS+= -I${FF_DPDK}/include
include ${TOPDIR}/mk/kern.pre.mk
KERNPREINCLUDES:= ${INCLUDES} KERNPREINCLUDES:= ${INCLUDES}
INCLUDES= -I${OVERRIDE_INCLUDES_ROOT} ${KERNPREINCLUDES} INCLUDES= -I${OVERRIDE_INCLUDES_ROOT} ${KERNPREINCLUDES}
INCLUDES+= -I./machine_include INCLUDES+= -I./machine_include