From nobody Fri Nov 17 16:35:38 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SX2Zf2Gc8z51870; Fri, 17 Nov 2023 16:35:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SX2Zf1lmVz4Ntq; Fri, 17 Nov 2023 16:35:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700238938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LJxI3v7EOIpWkONXVqhw2Mn0lCAwjUjkQ1rVYEQhEpg=; b=RVF8QIL0dUC3MvIK8eTpw/k8EuaOjQ1Iu5SkT269mEjiq1q/UVLiE5dd8hkOW8s9J7liw4 gG9VEKosOjFgInYc8/fpThL3us+Y7mFtsxAQvEL+wWwhRhfhe9nV+gwuVG9VJ4C9vf7R4h G4cjvgXoKJl50ZboX338xGwMjG92HbNWZ1py8pXX6VBRT8BVh5+ZmuPHoa05gDDKG9hK0y EJXM6I6Rg6r52e82gRrdZkdjrNYZUh75UFs4Maas4DI8U3Qfw7qtWFjJRArQhWsen7H1op h06nRAt5uDdk6nQ5HL4oYU7+ERFeeEExtk0OBHHvkiVHz6P37JBpSvPPgbircg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700238938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LJxI3v7EOIpWkONXVqhw2Mn0lCAwjUjkQ1rVYEQhEpg=; b=L5MVIfin1wyyJ6mlK0S2IMZOKQM2ow7Gx29/DisQziyrqeNcpv7dpNKIrX6N8m13/tGlpf TuF8oKmL0x4AFCp5hl8vSUyYgFw+h0+OhYy4CAA17KQE4xDlNwCo5KXTdHx/hExgTmbHfW 8lTkdtQrZaMCStbwEKCP6XqbfbULbEO5yaubc7o9ZKHQSvOkIbwIFFF/AeEyEre7zjIFFT iSBDMUtPPru7MMuUVpGIbB1Or0+yuqEmUvHd6tw+6bu55bNixi8oE7A/qNwFkfb+d0dJtG kUu0P/gSHWRlTtQb5nliEgjTqYSvCislSi6/7NwfOa7q+qx379L6zFx8fhGQAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700238938; a=rsa-sha256; cv=none; b=kT208fj4Q07gyYspVeRCgPMBm7XvFIHlTYO1YotX56zbb33nXcbmLwiFn1ukfDPysQG5My 7IEnOJpCfKdm3bwpBmHJwOPTIU5p14xM0wYMchqn+Eo2y4db4V0bHBdJwRzIJ3+1+EO4i1 b9n3UbJOnvb7A9x5iYd6z4zkdlS/7eMHEijbi+jHnLkwH67pzwvM+EmAxIQuIo+9ONPHnD NLh8gltKrBdTx4X8EMCXgufrM8jeAEDcN+Fbm/6c0ug5N54bsH5cfmtOKH6jVAtyQls8DT EXwbkJuvTGY/E47y0+FyGckzt6UAYwFe79y1jRJsCq8hFugVQUpImwlnDZCQIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SX2Zf0pJczr1b; Fri, 17 Nov 2023 16:35:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AHGZc2K024416; Fri, 17 Nov 2023 16:35:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AHGZcRk024413; Fri, 17 Nov 2023 16:35:38 GMT (envelope-from git) Date: Fri, 17 Nov 2023 16:35:38 GMT Message-Id: <202311171635.3AHGZcRk024413@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: b1538e8fc488 - main - dirdeps: Fix libpcap Makefile.depend.options List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1538e8fc488409113b833dd1c53aab1057b0568 Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=b1538e8fc488409113b833dd1c53aab1057b0568 commit b1538e8fc488409113b833dd1c53aab1057b0568 Author: Ka Ho Ng AuthorDate: 2023-11-17 16:34:57 +0000 Commit: Ka Ho Ng 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