From 3417cd687e5ec3e6ea695a8349aea2e8d545724a Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Thu, 3 Jul 2014 00:07:15 +0200 Subject: [PATCH] examples: ignore linux apps on bsd Do not try to build Linux examples in a BSD environment. Reported-by: Bruce Richardson Signed-off-by: Thomas Monjalon --- examples/Makefile | 2 +- examples/exception_path/Makefile | 7 +++++-- examples/netmap_compat/bridge/Makefile | 8 ++++++++ examples/qos_sched/Makefile | 7 +++++-- examples/vhost/Makefile | 8 ++++++++ 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index 4353b840a2..d0624f6b7d 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -51,7 +51,7 @@ DIRS-y += l2fwd DIRS-$(CONFIG_RTE_LIBRTE_IVSHMEM) += l2fwd-ivshmem DIRS-y += l3fwd DIRS-$(CONFIG_RTE_LIBRTE_ACL) += l3fwd-acl -DIRS-y += l3fwd-power +DIRS-$(CONFIG_RTE_LIBRTE_POWER) += l3fwd-power DIRS-y += l3fwd-vf DIRS-y += link_status_interrupt DIRS-y += load_balancer diff --git a/examples/exception_path/Makefile b/examples/exception_path/Makefile index 76f71d9e44..959914a2a5 100644 --- a/examples/exception_path/Makefile +++ b/examples/exception_path/Makefile @@ -39,9 +39,10 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk ifneq ($(CONFIG_RTE_EXEC_ENV),"linuxapp") -$(error This application can only operate in a linuxapp environment, \ +$(info This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) -endif +all: +else # binary name APP = exception_path @@ -53,3 +54,5 @@ CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) include $(RTE_SDK)/mk/rte.extapp.mk + +endif diff --git a/examples/netmap_compat/bridge/Makefile b/examples/netmap_compat/bridge/Makefile index 13eb229c94..50d96e8199 100644 --- a/examples/netmap_compat/bridge/Makefile +++ b/examples/netmap_compat/bridge/Makefile @@ -38,6 +38,12 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk +ifneq ($(CONFIG_RTE_EXEC_ENV),"linuxapp") +$(info This application can only operate in a linuxapp environment, \ +please change the definition of the RTE_TARGET environment variable) +all: +else + # binary name APP = bridge @@ -52,3 +58,5 @@ CFLAGS += -O3 -I$(SRCDIR)/../lib -I$(SRCDIR)/../netmap CFLAGS += $(WERROR_FLAGS) include $(RTE_SDK)/mk/rte.extapp.mk + +endif diff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile index 48713f9c80..f59645f527 100755 --- a/examples/qos_sched/Makefile +++ b/examples/qos_sched/Makefile @@ -39,9 +39,10 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk ifneq ($(CONFIG_RTE_EXEC_ENV),"linuxapp") -$(error This application can only operate in a linuxapp environment, \ +$(info This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) -endif +all: +else # binary name APP = qos_sched @@ -55,3 +56,5 @@ CFLAGS_args.o := -D_GNU_SOURCE CFLAGS_cfg_file.o := -D_GNU_SOURCE include $(RTE_SDK)/mk/rte.extapp.mk + +endif diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile index 47e054dd46..f45f83f78b 100644 --- a/examples/vhost/Makefile +++ b/examples/vhost/Makefile @@ -38,6 +38,12 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk +ifneq ($(CONFIG_RTE_EXEC_ENV),"linuxapp") +$(info This application can only operate in a linuxapp environment, \ +please change the definition of the RTE_TARGET environment variable) +all: +else + # binary name APP = vhost-switch @@ -50,3 +56,5 @@ CFLAGS += $(WERROR_FLAGS) LDFLAGS += -lfuse include $(RTE_SDK)/mk/rte.extapp.mk + +endif -- 2.20.1