From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by dpdk.org (Postfix) with ESMTP id 02AA1156 for ; Fri, 22 Nov 2013 11:24:07 +0100 (CET) Received: by mail-wi0-f174.google.com with SMTP id ez12so494531wid.1 for ; Fri, 22 Nov 2013 02:25:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=V0FVTTag7YN2VDapX7JqVpoyfMADoyCMe38UIzkgVc8=; b=UmrOUyiLwoCgFPssYis16oT+YykxcXIpzw8YhpvUvYyGpK9JAJcHeWc7W3EhsLHub2 b2fq9jgsUxJMdmZIWn78ONvCNtuz7nDIBGYpGkOlUBuQ9q2qMItFlUB0Tb3da3j8NQFd WHtSAL8MkqcixMuPa5jB6EhBF7pc7LPY2uxAZDQ0JeFsgTUwr9836X6G+qpB32rAi5lX JIBrzrzifdBNAlIjaSi23SLXA1ZrSsxvmHW2nDrgeQgGGFtpS86bNu+NTuZ2VOLEQXzF jfto/KhAK6AzXyhYSsyImQXoIyZtA0JU0JYRQPF0jrWkZAd8o/RJJkDHRU1YWwzYC9J5 Z+lg== X-Gm-Message-State: ALoCoQnoEgDRTnitzrlcA7xWSRB/2pP/coY4Sf7ptidqbifCBFVv/xpv0sN6DJ1XaZnCCryF7RAo X-Received: by 10.180.210.206 with SMTP id mw14mr2050327wic.14.1385115906398; Fri, 22 Nov 2013 02:25:06 -0800 (PST) Received: from alcyon.dev.6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id c10sm14319377wie.11.2013.11.22.02.25.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Nov 2013 02:25:05 -0800 (PST) From: David Marchand To: dev@dpdk.org Date: Fri, 22 Nov 2013 11:24:55 +0100 Message-Id: X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH 1/3] pcap: use pcap-config to guess compilation flags X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Nov 2013 10:24:08 -0000 Use pcap-config to populate CFLAGS and LDFLAGS. LIBPCAP_CFLAGS and LIBPCAP_LDFLAGS can be used to override this (useful when cross-compiling). Signed-off-by: David Marchand --- app/test-pmd/Makefile | 4 ---- doc/build-sdk-quick.txt | 2 ++ mk/rte.app.mk | 5 ++++- mk/rte.sdkbuild.mk | 8 ++++++++ mk/target/generic/rte.vars.mk | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/test-pmd/Makefile b/app/test-pmd/Makefile index cd04ea5..2ced595 100644 --- a/app/test-pmd/Makefile +++ b/app/test-pmd/Makefile @@ -39,10 +39,6 @@ APP = testpmd CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) -ifeq ($(CONFIG_RTE_LIBRTE_PMD_PCAP),y) -LDFLAGS += -lpcap -endif - # # all source are stored in SRCS-y # diff --git a/doc/build-sdk-quick.txt b/doc/build-sdk-quick.txt index 18b0ee6..ca39c33 100644 --- a/doc/build-sdk-quick.txt +++ b/doc/build-sdk-quick.txt @@ -11,6 +11,8 @@ Build variables EXTRA_CPPFLAGS preprocessor options EXTRA_CFLAGS compiler options EXTRA_LDFLAGS linker options + LIBPCAP_CFLAGS libpcap compiler options + LIBPCAP_LDFLAGS libpcap linker options CROSS toolchain prefix V verbose D debug dependencies diff --git a/mk/rte.app.mk b/mk/rte.app.mk index d2ce5c0..9420f24 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -150,7 +150,10 @@ LDLIBS += -lrte_eal endif ifeq ($(CONFIG_RTE_LIBRTE_PMD_PCAP),y) -LDLIBS += -lrte_pmd_pcap -lpcap +LDLIBS += -lrte_pmd_pcap +LIBPCAP_LDFLAGS ?= $(shell pcap-config --libs) +$(if $(LIBPCAP_LDFLAGS),,$(error LIBPCAP_LDFLAGS is undefined)) +LDLIBS += $(LIBPCAP_LDFLAGS) endif LDLIBS += $(EXECENV_LDLIBS) diff --git a/mk/rte.sdkbuild.mk b/mk/rte.sdkbuild.mk index 0dc23ff..33bed57 100644 --- a/mk/rte.sdkbuild.mk +++ b/mk/rte.sdkbuild.mk @@ -40,6 +40,14 @@ else include $(RTE_SDK)/mk/rte.vars.mk endif +ifeq ($(CONFIG_RTE_LIBRTE_PMD_PCAP),y) +LIBPCAP_CFLAGS ?= $(shell pcap-config --cflags) +$(if $(LIBPCAP_CFLAGS),,$(error LIBPCAP_CFLAGS is undefined)) +EXTERNAL_LIB_CFLAGS += $(LIBPCAP_CFLAGS) +endif + +export EXTERNAL_LIB_CFLAGS + # # include .depdirs and define rules to order priorities between build # of directories. diff --git a/mk/target/generic/rte.vars.mk b/mk/target/generic/rte.vars.mk index 9030f44..22893fc 100644 --- a/mk/target/generic/rte.vars.mk +++ b/mk/target/generic/rte.vars.mk @@ -104,7 +104,7 @@ ifeq ($(KERNELRELEASE),) # merge all CFLAGS CFLAGS := $(CPU_CFLAGS) $(EXECENV_CFLAGS) $(TOOLCHAIN_CFLAGS) $(MACHINE_CFLAGS) -CFLAGS += $(TARGET_CFLAGS) +CFLAGS += $(TARGET_CFLAGS) $(EXTERNAL_LIB_CFLAGS) # merge all LDFLAGS LDFLAGS := $(CPU_LDFLAGS) $(EXECENV_LDFLAGS) $(TOOLCHAIN_LDFLAGS) $(MACHINE_LDFLAGS) -- 1.7.10.4