From nobody Wed Jun 08 17:40:10 2022 X-Original-To: bugs@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 1E8D383692D for ; Wed, 8 Jun 2022 17:40:11 +0000 (UTC) (envelope-from bugzilla-noreply@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 4LJDyL6LZlz4rB6 for ; Wed, 8 Jun 2022 17:40:10 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (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 B9DEB13F70 for ; Wed, 8 Jun 2022 17:40:10 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 258HeA9M066045 for ; Wed, 8 Jun 2022 17:40:10 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 258HeA8t066044 for bugs@FreeBSD.org; Wed, 8 Jun 2022 17:40:10 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 233265] 'make -V MAKEOBJDIRPREFIX' at the top of base source tree doesn't work if value of MAKEOBJDIRPREFIX is customized Date: Wed, 08 Jun 2022 17:40:10 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Base System X-Bugzilla-Component: bin X-Bugzilla-Version: CURRENT X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Some People X-Bugzilla-Who: bdrewery@FreeBSD.org X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: bugs@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: cc Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: Bug reports List-Archive: https://lists.freebsd.org/archives/freebsd-bugs List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-bugs@freebsd.org MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654710010; 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: in-reply-to:in-reply-to:references:references; bh=CpUDs2qT/8EjqfObSU37ZZYbt7YWBnZ07Az8LedX9BA=; b=gO++IuypbU9oMloskMlYgD4PQVhohCumctDZuYfU372TK5VtjXWiMRcwL+PCQaXcAT67Ga O3WaOej/IGYfzVFqr+VPCKn8XcYlcILicBG8zAyKeSHvLsCj3Ow7mJhPXsCdfh/2MpoHoM 8mtXxyQK0tEL12cexxybXlNuo2515zBoei2QHWNIfiNaQGPFDXss/IpPMW7wQ9KkAmaNxa wYp97nHQjuU54Yoxcg0O2NIi+S4ITUxpmL2A0jUJjqu7EeV1JDWWq7sRRIOd/fJNFhVt3T cEeI+pGn227cUJgq+qFIYz8eqURXejP6WEHxbxKxl1ZP9UHYP7/qr5oFoOW7jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654710010; a=rsa-sha256; cv=none; b=f421cNSnG4RM7j715VDdfZl9TTCUrmyv3Mk0ww3ge9VIyl0idb4ZuRvChrd75l5vYqotGs W3U+AzVVdLELoLMzVKYUl2NWzsVT8aATSRBYLczYzLcsdqwmwnvz7HE9oGx51t8UXVfjtQ 8AT1ureEXseqGjjXeA+iLrTIrlcsy8ZCZgeFwcswDPjeRbwDQTKQEpRxZsU8KARhB1uSuf oqK9HoLB054oit2EwgUE7o3NgQ5YpGMUVA1V2a0Qvb4HZ/7iKGbVnR1sycf55l9VZ48SVL tcaX9eHq0mrW90LaWYTHuMjqZynCB/lICDu2VoulSTqnUvSFEvRovcbwdm8GgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D233265 Bryan Drewery changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |sjg@FreeBSD.org --- Comment #1 from Bryan Drewery --- This is quite old but yes that change did remove MAKEOBJDIRPREFIX there. The code was activated / moved from another file and originated from here (for a different build mode involving MK_DIRDEPS_BUILD): commit 916c1cd0abd348b515a8ac1e6dc4326eb52bbbed Author: Simon J. Gerraty Date: Sat Jun 20 21:48:07 2015 +0000 Deal with MAKEOBJDIRPREFIX MAKEOBJDIRPREFIX does not really fit our model. Use it to set OBJROOT to about where user expects and set MAKEOBJDIR to do what we want. Notes: svn path=3D/head/; revision=3D284650 diff --git share/mk/local.meta.sys.mk share/mk/local.meta.sys.mk index 2b7f81d49b82..b3cb2575d457 100644 --- share/mk/local.meta.sys.mk +++ share/mk/local.meta.sys.mk @@ -8,6 +8,18 @@ MK_INSTALL_AS_USER=3D yes .if empty(OBJROOT) || ${.MAKE.LEVEL} =3D=3D 0 +.if defined(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX}) +.warning MAKEOBJDIRPREFIX not supported; setting MAKEOBJDIR... +# put things approximately where they want +OBJROOT:=3D${MAKEOBJDIRPREFIX}${SRCTOP:S,/src,,}/ +# OBJTOP set below +MAKEOBJDIR=3D$${.CURDIR:S,$${SRCTOP},$${OBJTOP},} +MAKEOBJDIRPREFIX=3D +# export but do not track +.export-env MAKEOBJDIRPREFIX MAKEOBJDIR +# now for our own use +MAKEOBJDIR=3D ${.CURDIR:S,${SRCTOP},${OBJTOP},} +.endif .if !empty(SB) SB_OBJROOT ?=3D ${SB}/obj/ # this is what we use below I think the following patch will fix it but it is not fully tested. There a= re a lot of complex cases that need testing before committing. diff --git share/mk/src.sys.obj.mk share/mk/src.sys.obj.mk index 3b48fc3c5514..236548b5e94b 100644 --- share/mk/src.sys.obj.mk +++ share/mk/src.sys.obj.mk @@ -48,9 +48,12 @@ MAKEOBJDIRPREFIX:=3D=20=20 ${MAKEOBJDIRPREFIX}${TARGET:D/${TARGET}.${TARGET_ARCH}} .if !empty(MAKEOBJDIRPREFIX) # put things approximately where they want OBJROOT:=3D ${MAKEOBJDIRPREFIX}${SRCTOP}/ +_saveMAKEOBJDIRPREFIX:=3D ${MAKEOBJDIRPREFIX} MAKEOBJDIRPREFIX=3D # export but do not track .export-env MAKEOBJDIRPREFIX +MAKEOBJDIRPREFIX:=3D ${_saveMAKEOBJDIRPREFIX} +.undef _saveMAKEOBJDIRPREFIX .endif .if empty(MAKEOBJDIR) # OBJTOP set below (I expected '.export-env MAKEOBJDIRPREFIX=3D' to work but it did not. I had= to do the dance above to export a blank value but keep the current value availabl= e) --=20 You are receiving this mail because: You are the assignee for the bug.=