[oe-commits] Joe MacDonald : ptpd: use pkgconfig

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: d1d09c11679db18955b28b9b2cc7628b8c9223df
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=d1d09c11679db18955b28b9b2cc7628b8c9223df

Author: Joe MacDonald <joe_macdonald at mentor.com>
Date:   Wed Feb 25 10:39:18 2015 -0500

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 at mentor.com>

---

 .../ptpd/ptpd/ptpd-use-pkgconfig.patch             | 35 ++++++++++++++++++++++
 .../recipes-daemons/ptpd/ptpd_2.3.1-rc2.bb         |  3 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch b/meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch
new file mode 100644
index 0000000..e4578dd
--- /dev/null
+++ b/meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch
@@ -0,0 +1,35 @@
+From 4c850b92a1cf8cfa19677c66bcde2edfab1a4490 Mon Sep 17 00:00:00 2001
+From: Joe MacDonald <joe_macdonald at 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 at 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
+
diff --git a/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1-rc2.bb b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1-rc2.bb
index 50cdc7f..0dcfc1f 100644
--- a/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1-rc2.bb
+++ b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1-rc2.bb
@@ -23,6 +23,7 @@ def get_sub(d):
 
 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-use-pkgconfig.patch \
            file://ptpd.service \
            file://ptpd.conf \
 "
@@ -34,7 +35,7 @@ S = "${WORKDIR}/ptpd-${PV}"
 
 EXTRA_OEMAKE = ""
 
-EXTRA_OECONF += "--disable-snmp"
+EXTRA_OECONF += "--disable-snmp --with-pcap-config=pkg-config"
 
 do_install() {
     install -d ${D}${bindir} ${D}${mandir}/man8