diff options
| author |   Joe MacDonald <joe_macdonald@mentor.com> | 2015-02-25 10:39:18 -0500 |
|---|---|---|
| committer | Joe MacDonald <joe_macdonald@mentor.com> | 2015-02-27 09:14:22 -0500 |
| commit | d1d09c11679db18955b28b9b2cc7628b8c9223df (patch) | |
| tree | bc4b015010292e1e1ceb1c3124095119241c56ee /meta-networking/recipes-daemons | |
| parent | 9a6775585c7e82b96109c9f9adc4e16b2f5d6cc3 (diff) | |
| download | meta-openembedded-contrib-d1d09c11679db18955b28b9b2cc7628b8c9223df.tar.gz | |
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>
Diffstat (limited to 'meta-networking/recipes-daemons')
| -rw-r--r-- | meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch | 35 | ||||
| -rw-r--r-- | meta-networking/recipes-daemons/ptpd/ptpd_2.3.1-rc2.bb | 3 |
2 files changed, 37 insertions, 1 deletions
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 0000000000..e4578dda74 --- /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@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 + 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 50cdc7f2d8..0dcfc1f7d6 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 |