From nobody Fri Jul 14 01:37:24 2023 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 4R2DcP2GH5z4mmpH; Fri, 14 Jul 2023 01:37:25 +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 4R2DcP0mhWz4kqN; Fri, 14 Jul 2023 01:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689298645; 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=HtercP4qxYoEPIC4ZmXvr9Prxw8s0jph2VjeHaH42fs=; b=FpbiDzF4tJPnACNmdgC9jGc9/M78PuGRdP2VHgNANrqfxy1GV/OIkdFH07gKB2ugWOholU Z08uqdiBHHzaztwFFITQioQxPROHRmP/ZXXQOvXQEdD8FPYTS2U+NI7tBqOtArq9jUFdeJ MGWqHSArmIrPFOMgyYeLxU1GevIeRQduB3rO5QaAw/sxj5RCDnv9Ia6IphmVFtediJbmcl m0NtR39EQwsVglYsO1h3n/yEJrACsEjCBeASA4rN0KK4UgjiWlouSN/JSrdT+gmRcBBLeT 4biK5TN4yfTQuQ0ToUlvF1lm6I4JpFpW9pEDL4ZTtd3cO4GcnY5wtnDRwU2Prw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689298645; 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=HtercP4qxYoEPIC4ZmXvr9Prxw8s0jph2VjeHaH42fs=; b=yiji66AQPgCLvtWNsr9hDZyztD4DG8DCAuJuZFqBkhqVdftS3aGcffPZ75uAlO9wPRKD9G 76hylt2ydWJ/PZ1zUL1ouELuUtVvt25aFe7OfAXV1h8RoVGPijpf+InVaSQFb/hc2BF0wI FY8ynJZVrWOqslb//c2MKPaNY07BM/URjRZKFQKr1iHzlwniMgbeWmc/hICITKjoPai53X Ae/XnGaHbRCMRF1t6CeoPKlC9Jqw3w/lVFKRN4zOsO8N7PqoaJ1C08amwZ2FHXzmVux+AS moMbxjrqbg3ru3XZCw8/E7sgM1dDy8ozte1GmN1SJsuSQ+8KNQSmfAoNmgbR3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689298645; a=rsa-sha256; cv=none; b=SgcjCgLndktw0cAmoHKWgoK8dv9Z172Lp0jsSspXUIYa+oJ2bQR0TLE66fqhn4EwHT1bcJ S339t4boIlhybiLRuVKAVJEOe5S3RaU76QzfVydltGQvBtobzk/5jnkMsAj2O+G/Zb/03Q LI4s5H5UkHtOz1HJtTAsPfyv8kahlSTXORiyDTs2Q/Yho9Ngc2d1Sl8fERLp1GEaals6Dz /lDJsffjxruf9B1N8JLmIrabsvjGs2aUFdti9m3sniAx2sMtjzKCA8KWhzUB9yktfsDjmV mHQKLlGHGQm82s8ICiQ/KgTXr4Wo8a+kTPj3Exl/cAOAlduYSkhmKRpNPO8DIA== 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 4R2DcN6lV2z1D6f; Fri, 14 Jul 2023 01:37:24 +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 36E1bOa9019345; Fri, 14 Jul 2023 01:37:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E1bO5r019344; Fri, 14 Jul 2023 01:37:24 GMT (envelope-from git) Date: Fri, 14 Jul 2023 01:37:24 GMT Message-Id: <202307140137.36E1bO5r019344@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 0a5e35a7b181 - main - Makefile.libcompat: Be consistent about not installing includes 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a5e35a7b1811308bcb2aa2e6c7e7bd49dfc9770 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=0a5e35a7b1811308bcb2aa2e6c7e7bd49dfc9770 commit 0a5e35a7b1811308bcb2aa2e6c7e7bd49dfc9770 Author: Jessica Clarke AuthorDate: 2023-07-14 01:36:04 +0000 Commit: Jessica Clarke CommitDate: 2023-07-14 01:36:04 +0000 Makefile.libcompat: Be consistent about not installing includes Currently we only pass MK_INCLUDES=no for distribute and install, since it's only in LIB${_LIBCOMPAT}IMAKE, which means that we enable includes during libraries and thus install includes into worldtmp, despite it being shared these days across native and libcompats. This also means we're at risk of having headers needed for building against a libcompat that don't get installed to the system, but do end up being installed to worldtmp. In particular, lib/msun has different fenv.h for aarch64 and arm, so aarch64 will need arm's copy when it grows lib32 support, and this would be installed to worldtmp, but not to the system, meaning any programs that use fenv.h wouldn't be able to be built. Instead, be consistent, and don't install includes at all during any of the libcompat phases, so that we can detect these issues and ensure any needed headers are installed for both worldtmp and the system. Reviewed by: brooks Differential Revision: https://reviews.freebsd.org/D41030 --- Makefile.libcompat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.libcompat b/Makefile.libcompat index 72ea4d865647..e8d33b905559 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -38,10 +38,10 @@ LIB${_LIBCOMPAT}WMAKE+= ${TIME_ENV} ${LIB${_LIBCOMPAT}WMAKEENV} ${MAKE} \ OBJTOP=${LIB${_LIBCOMPAT}_OBJTOP} \ OBJROOT='$${OBJTOP}/' \ MAKEOBJDIRPREFIX= \ + MK_INCLUDES=no \ MK_MAN=no MK_HTML=no LIB${_LIBCOMPAT}IMAKE+= ${LIB${_LIBCOMPAT}WMAKE:NINSTALL=*:NDESTDIR=*} \ ${IMAKE_INSTALL} \ - MK_INCLUDES=no \ -DLIBRARIES_ONLY # Shared logic