From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: bluca@debian.org, jerin.jacob@caviumnetworks.com,
hemant.agrawal@nxp.com,
Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [PATCH 2/2] net/pcap: fix cross compilation
Date: Tue, 19 Dec 2017 10:52:22 +0000 [thread overview]
Message-ID: <20171219105222.198664-3-bruce.richardson@intel.com> (raw)
In-Reply-To: <20171219105222.198664-1-bruce.richardson@intel.com>
The detection of pcap as a dependency involves invoking pcap-config to get
parameters - something not possible in a cross-compilation environment.
Therefore we need to just look for the presence of the library in a
cross-compilation environment and assume if the library is present we can
compile and link against it.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/pcap/meson.build | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/drivers/net/pcap/meson.build b/drivers/net/pcap/meson.build
index 2051ccab0..36f997c39 100644
--- a/drivers/net/pcap/meson.build
+++ b/drivers/net/pcap/meson.build
@@ -29,13 +29,22 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-pcap_dep = dependency('pcap', required: false)
-if pcap_dep.found() == true
- ext_deps += pcap_dep
-elif find_program('pcap-config', required: false).found() == true
- ext_deps += cc.find_library('pcap')
+if meson.is_cross_build()
+ pcap_dep = cc.find_library('pcap', required: false)
+ if pcap_dep.found()
+ ext_deps += pcap_dep
+ else
+ build = false
+ endif
else
- build = false
+ pcap_dep = dependency('pcap', required: false)
+ if pcap_dep.found() == true
+ ext_deps += pcap_dep
+ elif find_program('pcap-config', required: false).found() == true
+ ext_deps += cc.find_library('pcap')
+ else
+ build = false
+ endif
endif
sources = files('rte_eth_pcap.c')
pkgconfig_extra_libs += '-lpcap'
--
2.14.3
next prev parent reply other threads:[~2017-12-19 10:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-19 10:52 [dpdk-dev] [PATCH 0/2] Enable cross-compilation of DPDK with meson Bruce Richardson
2017-12-19 10:52 ` [dpdk-dev] [PATCH 1/2] build: remove architecture flag as default C flag Bruce Richardson
2017-12-19 10:52 ` Bruce Richardson [this message]
2017-12-19 13:25 ` [dpdk-dev] [PATCH 0/2] Enable cross-compilation of DPDK with meson Luca Boccassi
2017-12-19 14:30 ` Bruce Richardson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171219105222.198664-3-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=bluca@debian.org \
--cc=dev@dpdk.org \
--cc=hemant.agrawal@nxp.com \
--cc=jerin.jacob@caviumnetworks.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).