From nobody Fri Jul 01 07:33:25 2022 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 615208B3121; Fri, 1 Jul 2022 07:33:26 +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 4LZ6Pd5y4Qz4w52; Fri, 1 Jul 2022 07:33:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656660805; 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=/qwcFKoSEnOtdW9HBHtNCzWbrfGF+QaZNvT/Wivr5d0=; b=SfNTrvEXDCSN3bC7MB8NcmILJe2QpFzhxG3dDT+xi+O1kG9y3JzLiTApCWrWauN25G1xPr rQeANWDkohDY0fnDkatcB9m59dAuRlu6eVTgMWj6uJA5TquNTnd5loDsCIeNJytohYg6Ff TlZ8hssbDEy3J0gTeX3xRg7FB+dou2g0wMaplaWGg9Ps/kYOyyf0d4ipegmZbaaGqLq/wD 7Y9bsygID3M7EB2YE4MDtBj5imnQ7b2ut21RnI3SO79zABIpWMWcaON3uTFn6W6Xg/adrx TKz9BAsM1FHi0wrGV2eNJgDVLPageo5WWngJLrbHVOnUaNR2HB5GC79GZKnIAQ== 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 8E1CF170B7; Fri, 1 Jul 2022 07:33:25 +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 2617XPLa059665; Fri, 1 Jul 2022 07:33:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2617XPOf059664; Fri, 1 Jul 2022 07:33:25 GMT (envelope-from git) Date: Fri, 1 Jul 2022 07:33:25 GMT Message-Id: <202207010733.2617XPOf059664@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 724123b9f4d3 - main - libcompat: Use WORLDTMP sysroot 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 724123b9f4d3ae7600b029ce7c81b5708c1e13b8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656660805; 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=/qwcFKoSEnOtdW9HBHtNCzWbrfGF+QaZNvT/Wivr5d0=; b=siLvT7API7XCBaKpbKcTFjI8U5m2wdjOcl5g5tqV80f+HnPkPyoce7eOMpIhzfzwYsyTZu 2VserkHUmWbzKUy2agn+b5HhMeuekXTp4dnXU/HlnwS4eUDCgPCfniFb8luQwzzC2zNeQ1 rkqUsbhNCvdKro7bDOEtjniKuznOu2gzGaxUmzCBJj3HQGsiOFuhscKd8sB59LTSADnTPH Y1YFOWWtt5qclg44+R++GLbE8XumeKSSaDepSQ9UwfnM2mUrHzYTUy1gNpR3Z5MkFK3dsk p1uaSmwMIsbtTI5WTt1mK2rrNaWYzLT4FYzdScBtUhSNcf+2YYtOPyeVJzJ8fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656660805; a=rsa-sha256; cv=none; b=YeA48eSa/ec26jQ4tGJIf9mD4MPAx5xtEvRrQNAFZHpxr5103XGx1nrRN/jeL1aQMu+xWA 6Jk1J59WpD6NxEe6CAbrB1zFKOB/aF8Q4P6Keu3VEf9Kv+b9KscPPw1GRViR49QV53KOof UnpyDl9CWXCSxUMKLLJxQElvI164kqycraCrTXzF30lGfiNrVJGNQ8x+YWIAZhDIMUfiU3 o3+tjbHbzk0qIhj5gFmg7g8gUKYQbYGUk82pEo8lQq992XHYqSgLFaMWIiO3VXqkRDxiXj fZKc6thbUEK9TWfqnrp4PT/DN9vd167ozy+m/SGQCAj8KGNyyl4zHwnp30Wnsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=724123b9f4d3ae7600b029ce7c81b5708c1e13b8 commit 724123b9f4d3ae7600b029ce7c81b5708c1e13b8 Author: Brooks Davis AuthorDate: 2022-07-01 07:33:16 +0000 Commit: Brooks Davis CommitDate: 2022-07-01 07:33:16 +0000 libcompat: Use WORLDTMP sysroot Now that -m32 is fixed, just install libs in ${WORLDTMP}/lib/lib32 and use the installed headers. Reviewed by: imp, jhb Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D34697 --- Makefile.libcompat | 34 ++++------------------------------ share/mk/bsd.compat.mk | 14 +++++++------- 2 files changed, 11 insertions(+), 37 deletions(-) diff --git a/Makefile.libcompat b/Makefile.libcompat index e1b66f4a6ab2..a1f683c77a49 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -12,7 +12,7 @@ __<${_this:T}>__: LIBCOMPATWMAKEENV+= \ INSTALL="${INSTALL_CMD} -U" \ PATH=${TMPPATH} \ - SYSROOT=${LIBCOMPATTMP} \ + SYSROOT=${WORLDTMP} \ LIBDIR=/usr/lib${libcompat} \ SHLIBDIR=/usr/lib${libcompat} \ DTRACE="${LIB$COMPATDTRACE:U${DTRACE}}" @@ -23,7 +23,7 @@ LIBCOMPATWMAKEENV+= BUILD_TOOLS_META=.NOMETA LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \ CXX="${XCXX} ${LIBCOMPATCXXFLAGS} ${LIBCOMPATCFLAGS}" \ CPP="${XCPP} ${LIBCOMPATCFLAGS}" \ - DESTDIR=${LIBCOMPATTMP} \ + DESTDIR=${WORLDTMP} \ -DNO_CPU_CFLAGS \ MK_BOOT=no \ MK_CTF=no \ @@ -62,38 +62,12 @@ build${libcompat}: .PHONY @echo "--------------------------------------------------------------" @echo ">>> stage 4.3: building lib${libcompat} shim libraries" @echo "--------------------------------------------------------------" -.if ${MK_CLEAN} == "yes" - rm -rf ${LIBCOMPATTMP} -.else - ${_+_}@if [ -e "${LIBCOMPATTMP}" ]; then \ - echo ">>> Deleting stale files in build${libcompat} tree..."; \ - cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \ - DESTDIR=${LIBCOMPATTMP} \ - delete-old delete-old-libs >/dev/null; \ - fi -.endif # MK_CLEAN == "yes" - - mkdir -p ${LIBCOMPATTMP}/usr/include - ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ - -p ${LIBCOMPATTMP}/usr >/dev/null - ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.include.dist \ - -p ${LIBCOMPATTMP}/usr/include >/dev/null ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \ - -p ${LIBCOMPATTMP}/usr >/dev/null + -p ${WORLDTMP}/usr >/dev/null .if ${MK_DEBUG_FILES} != "no" - ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ - -p ${LIBCOMPATTMP}/usr/lib >/dev/null ${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \ - -p ${LIBCOMPATTMP}/usr/lib/debug/usr >/dev/null + -p ${WORLDTMP}/usr/lib/debug/usr >/dev/null .endif - mkdir -p ${WORLDTMP} - ln -sf ${.CURDIR}/sys ${WORLDTMP} -.for _t in ${_obj} includes -.for _dir in ${_LC_INCDIRS} - ${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATWMAKE} MK_INCLUDES=yes \ - DIRPRFX=${_dir}/ ${_t} -.endfor -.endfor .for _dir in lib/ncurses/tinfo ${_libmagic} ${_jevents} .for _t in ${_obj} build-tools ${_+_}cd ${.CURDIR}/${_dir}; \ diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index e99281775b84..db6c82e099d9 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -95,34 +95,34 @@ _LIBCOMPAT:= ${WANT_COMPAT} # Set defaults based on type. libcompat= ${_LIBCOMPAT:tl} _LIBCOMPAT_MAKEVARS= _OBJTOP TMP CPUFLAGS CFLAGS CXXFLAGS LDFLAGS \ - _MACHINE _MACHINE_ARCH WMAKEENV WMAKEFLAGS WMAKE + _MACHINE _MACHINE_ARCH \ + WMAKEENV WMAKEFLAGS WMAKE WORLDTMP .for _var in ${_LIBCOMPAT_MAKEVARS} .if !empty(LIB${_LIBCOMPAT}${_var}) LIBCOMPAT${_var}?= ${LIB${_LIBCOMPAT}${_var}} .endif .endfor +WORLDTMP?= ${SYSROOT} + # Shared flags LIBCOMPAT_OBJTOP?= ${OBJTOP}/obj-lib${libcompat} -LIBCOMPATTMP?= ${LIBCOMPAT_OBJTOP}/tmp LIBCOMPATCFLAGS+= ${LIBCOMPATCPUFLAGS} \ - --sysroot=${LIBCOMPATTMP} \ + --sysroot=${WORLDTMP} \ ${BFLAGS} -LIBCOMPATLDFLAGS+= -L${LIBCOMPATTMP}/usr/lib${libcompat} +LIBCOMPATLDFLAGS+= -L${WORLDTMP}/usr/lib${libcompat} LIBCOMPATWMAKEENV+= MACHINE=${LIBCOMPAT_MACHINE} LIBCOMPATWMAKEENV+= MACHINE_ARCH=${LIBCOMPAT_MACHINE_ARCH} # -B is needed to find /usr/lib32/crti.o for gcc. -LIBCOMPATCFLAGS+= -B${LIBCOMPATTMP}/usr/lib${libcompat} +LIBCOMPATCFLAGS+= -B${WORLDTMP}/usr/lib${libcompat} .if defined(WANT_COMPAT) LIBDIR_BASE:= /usr/lib${libcompat} _LIB_OBJTOP= ${LIBCOMPAT_OBJTOP} -LIBDESTDIR:= ${LIBCOMPATTMP} -SYSROOT:= ${LIBCOMPATTMP} CFLAGS+= ${LIBCOMPATCFLAGS} LDFLAGS+= ${CFLAGS} ${LIBCOMPATLDFLAGS} MACHINE= ${LIBCOMPAT_MACHINE}