git: b1538e8fc488 - main - dirdeps: Fix libpcap Makefile.depend.options
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 17 Nov 2023 16:35:38 UTC
The branch main has been updated by khng:
URL: https://cgit.FreeBSD.org/src/commit/?id=b1538e8fc488409113b833dd1c53aab1057b0568
commit b1538e8fc488409113b833dd1c53aab1057b0568
Author: Ka Ho Ng <khng@FreeBSD.org>
AuthorDate: 2023-11-17 16:34:57 +0000
Commit: Ka Ho Ng <khng@FreeBSD.org>
CommitDate: 2023-11-17 16:34:57 +0000
dirdeps: Fix libpcap Makefile.depend.options
This prevents libpcap's Makefile.depend from flip-flopping when OFED is
enabled.
Sponsored by : Juniper Networks, Inc.
MFC after: 7 days
Reviewed by: sjg
Differential Revision: https://reviews.freebsd.org/D42649
---
lib/libpcap/Makefile.depend | 1 -
lib/libpcap/Makefile.depend.options | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/libpcap/Makefile.depend b/lib/libpcap/Makefile.depend
index 59966dc1a8ec..12b15914f2b6 100644
--- a/lib/libpcap/Makefile.depend
+++ b/lib/libpcap/Makefile.depend
@@ -7,7 +7,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/ofed/include \
usr.bin/yacc.host \
diff --git a/lib/libpcap/Makefile.depend.options b/lib/libpcap/Makefile.depend.options
index 1c4c26ed4a5a..b02b812e2267 100644
--- a/lib/libpcap/Makefile.depend.options
+++ b/lib/libpcap/Makefile.depend.options
@@ -2,6 +2,6 @@
DIRDEPS_OPTIONS= OFED
-DIRDEPS.OFED.yes= lib/ofed/libibverbs lib/ofed/libmlx5
+DIRDEPS.OFED.yes= lib/ofed/include lib/ofed/libibverbs lib/ofed/libmlx5
.include <dirdeps-options.mk>