From nobody Thu Nov 17 00:15:59 2022 X-Original-To: dev-commits-src-all@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 4NCL6l3YD0z4hWXL; Thu, 17 Nov 2022 00:15:59 +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 4NCL6l2yxbz4LL2; Thu, 17 Nov 2022 00:15:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668644159; 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=B5bSxfm2HRtIfPh+mYJp+hn/3voIVvHC+nud/OsUd7U=; b=gS42yv6eZLE/6ho/XciZFXlTEt75bPaPMbmW8WRRlgUs3kDDPjNGEUOQNYfCI9xu0SdPeo RZW7CbcKGy7wVZLy/eWOUoqPFzvXmjy1/3/p1urr2xT5MnIMQAqeO3COC9zVQv6wdc/YZV P1vqEinmi62r5ueHwqgXwNdOFURXLkbNOaDVFi28hiwCfd4NNTbyB1IjUpMwkMXo1vxtlk P6bJCywfAK0rd3VlRoHUUJAspUpsigBHHalc5zxYkka8++AChcO5YXJlB91wZq1QjYjPgW o60Po/prjaeDp15RIpyL+2+cVMU9PdNE0QcTaaUJAxpKE0TCgkJKAyJvlP9kFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668644159; 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=B5bSxfm2HRtIfPh+mYJp+hn/3voIVvHC+nud/OsUd7U=; b=R7CG0DAXnSmXpF+jIkOzemCvhQClTU2CMQxcY6G9M2yRemVLiPAkOSGk06vHoFB2/ICjo2 XEekuikJ6YZ0SZ9+fZg1Y9cT86cUMR2roefjM3yfcWDWWyHpbaIqAQrL7pWE5WGwYAbddG nicuhgfpUUGwpoohr3HuVzCxw6BhgUKCy8jG+mZE/EfPHF2fZwUXxcNHwrQC2T9fYNKrXh v50r12sKy+vIsSyZpsQwNQDNEXl4Ct/lsWCl9KBozK9SgBwnOEtUWusRgx/+cDQ2hA++px 5qM3jp60jHMH5m5XVJmNXQ6VGlEO3vACQopelueo5mJnJY4xd/wh0sHlk8E7pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668644159; a=rsa-sha256; cv=none; b=u2y2fFP4+bmiOot4wnJXaRUlYwxePjM8kWZMOucLlzvqhCUeV/dvrKzEgtob81+jCI0mZO 1iNnHnJkFWjuDBLxcN/64+CtCDsUgkJf8cViwGcOvfcGnA6ISp3rf77UgLp1thhkHWabut g567glKpuFM+/+XAC4zXJjymulAemNDp+hDmXRtliXgaiLlxx8MSTVnogE9lL/t35UwtLU jkUxYFeLr1Gb8BVswvAah8QQUrBFA/8PRl9NKqX/29gV6Gn7QeTfwUPHdbfnLhXJViaZZd 1D5J+/SbX2NVS4rZIEWIi+BAGV3xyzikOse4IeTDFKOjtgzyBgelnEGFdxYL0w== 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 4NCL6l1lrWzMQP; Thu, 17 Nov 2022 00:15:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AH0FxEK034723; Thu, 17 Nov 2022 00:15:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AH0Fxpp034722; Thu, 17 Nov 2022 00:15:59 GMT (envelope-from git) Date: Thu, 17 Nov 2022 00:15:59 GMT Message-Id: <202211170015.2AH0Fxpp034722@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 227f47ce0c48 - main - libcompat: avoid installing include files twice List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 227f47ce0c48acdb466366b136b8c522bb8937e0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=227f47ce0c48acdb466366b136b8c522bb8937e0 commit 227f47ce0c48acdb466366b136b8c522bb8937e0 Author: Ed Maste AuthorDate: 2022-11-17 00:12:18 +0000 Commit: Ed Maste CommitDate: 2022-11-17 00:15:20 +0000 libcompat: avoid installing include files twice Previously some headers were getting installed twice, once as expected and then a second time as part of the compat32 library stage. Makefile.libcompat sets -DLIBRARIES_ONLY for the install make invocation which causes bsd.lib.mk to skip headers. However some headers are handled via bsd.prog.mk, which does not use LIBRARIES_ONLY. Explicitly set MK_INCLUDES=no. Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37413 --- Makefile.libcompat | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.libcompat b/Makefile.libcompat index c8a71225f802..5343b2e2480c 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -36,6 +36,7 @@ LIBCOMPATWMAKE+= ${TIME_ENV} ${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} MK_MAN=no MK_HTML=no LIBCOMPATIMAKE+= ${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*} \ ${IMAKE_INSTALL} \ + MK_INCLUDES=no \ -DLIBRARIES_ONLY _LC_LIBDIRS.yes= lib