summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <patrick.mclean@sony.com>2019-01-08 15:54:33 -0800
committerPatrick McLean <chutzpah@gentoo.org>2019-01-08 15:54:55 -0800
commitaa51d55cd7028c025d5edad781178d8abccf2aea (patch)
tree085f679766c7c32f438bed75f3c0be627a324ba4 /net-misc/lldpd/files
parentapp-metrics/memcached_exporter: memcached exporter for prometheus (diff)
downloadgentoo-aa51d55cd7028c025d5edad781178d8abccf2aea.tar.gz
gentoo-aa51d55cd7028c025d5edad781178d8abccf2aea.tar.bz2
gentoo-aa51d55cd7028c025d5edad781178d8abccf2aea.zip
net-misc/lldpd: Fix USE="fdp -cdp" in 1.0.3 (bug #674900)
Closes: https://bugs.gentoo.org/674900 Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'net-misc/lldpd/files')
-rw-r--r--net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch b/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch
new file mode 100644
index 000000000000..17099a2f819b
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch
@@ -0,0 +1,30 @@
+commit 4e7ec8233cd185941eaa9e41785cfc53f92799b4
+Author: Vincent Bernat <vincent@bernat.ch>
+Date: Tue Jan 8 17:19:15 2019 -0500
+
+ build: fix compilation with `--enable-fdp --disable-cdp`
+
+ Fix #315
+
+diff --git a/src/lldpd-structs.h b/src/lldpd-structs.h
+index c3ffa10..f6b03d7 100644
+--- a/src/lldpd-structs.h
++++ b/src/lldpd-structs.h
+@@ -129,7 +129,7 @@ struct lldpd_dot3_power {
+ MARSHAL(lldpd_dot3_power);
+ #endif
+
+-#ifdef ENABLE_CDP
++#if defined (ENABLE_CDP) || defined (ENABLE_FDP)
+ struct cdpv2_power {
+ u_int16_t request_id;
+ u_int16_t management_id;
+@@ -273,7 +273,7 @@ struct lldpd_port {
+ struct lldpd_med_power p_med_power;
+ #endif
+
+-#ifdef ENABLE_CDP
++#if defined (ENABLE_CDP) || defined (ENABLE_FDP)
+ struct cdpv2_power p_cdp_power;
+ #endif
+