mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
ptpd: use pkgconfig
pcap-config should not be used for determining how to build against libpcap in a yocto environment. Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
@@ -0,0 +1,35 @@
|
|||||||
|
From 4c850b92a1cf8cfa19677c66bcde2edfab1a4490 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Joe MacDonald <joe_macdonald@mentor.com>
|
||||||
|
Date: Tue, 24 Feb 2015 23:02:14 -0500
|
||||||
|
Subject: [PATCH] ptpd: use pkgconfig
|
||||||
|
|
||||||
|
Yocto uses pkg-config for libpcap, rather than pcap-config, so use that
|
||||||
|
instead as the source for libs and cflags.
|
||||||
|
|
||||||
|
Upstream-status: Inappropriate [ embedded specific ]
|
||||||
|
|
||||||
|
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
|
||||||
|
---
|
||||||
|
configure.ac | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index dc9541f..288f547 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -112,10 +112,10 @@ case "$try_pcap" in
|
||||||
|
yes)
|
||||||
|
case "$PATH_PCAP_CONFIG" in
|
||||||
|
/*)
|
||||||
|
- PCAP_LIBS=`$PATH_PCAP_CONFIG --libs`
|
||||||
|
+ PCAP_LIBS=`$PATH_PCAP_CONFIG --libs libpcap`
|
||||||
|
AC_SUBST([PCAP_LIBS])
|
||||||
|
# Separate CPPFLAGS and CFLAGS
|
||||||
|
- foo=`$PATH_PCAP_CONFIG --cflags`
|
||||||
|
+ foo=`$PATH_PCAP_CONFIG --cflags libpcap`
|
||||||
|
PCAP_CPPFLAGS=
|
||||||
|
PCAP_CFLAGS=
|
||||||
|
for i in $foo; do
|
||||||
|
--
|
||||||
|
1.9.1
|
||||||
|
|
||||||
@@ -23,6 +23,7 @@ def get_sub(d):
|
|||||||
|
|
||||||
SRC_URI = "http://downloads.sourceforge.net/project/ptpd/ptpd/${@get_sub(d)}/ptpd-${PV}.tar.gz \
|
SRC_URI = "http://downloads.sourceforge.net/project/ptpd/ptpd/${@get_sub(d)}/ptpd-${PV}.tar.gz \
|
||||||
file://ptpd-add-dpaa-etsec-support.patch \
|
file://ptpd-add-dpaa-etsec-support.patch \
|
||||||
|
file://ptpd-use-pkgconfig.patch \
|
||||||
file://ptpd.service \
|
file://ptpd.service \
|
||||||
file://ptpd.conf \
|
file://ptpd.conf \
|
||||||
"
|
"
|
||||||
@@ -34,7 +35,7 @@ S = "${WORKDIR}/ptpd-${PV}"
|
|||||||
|
|
||||||
EXTRA_OEMAKE = ""
|
EXTRA_OEMAKE = ""
|
||||||
|
|
||||||
EXTRA_OECONF += "--disable-snmp"
|
EXTRA_OECONF += "--disable-snmp --with-pcap-config=pkg-config"
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
install -d ${D}${bindir} ${D}${mandir}/man8
|
install -d ${D}${bindir} ${D}${mandir}/man8
|
||||||
|
|||||||
Reference in New Issue
Block a user