From owner-freebsd-amd64@FreeBSD.ORG Tue Mar 2 00:10:07 2010 Return-Path: Delivered-To: freebsd-amd64@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D90FE1065676 for ; Tue, 2 Mar 2010 00:10:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9B9DC8FC16 for ; Tue, 2 Mar 2010 00:10:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o220A7dg088260 for ; Tue, 2 Mar 2010 00:10:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o220A7MA088259; Tue, 2 Mar 2010 00:10:07 GMT (envelope-from gnats) Resent-Date: Tue, 2 Mar 2010 00:10:07 GMT Resent-Message-Id: <201003020010.o220A7MA088259@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-amd64@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alexander Best Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E7A71106564A for ; Tue, 2 Mar 2010 00:08:16 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id D61C78FC13 for ; Tue, 2 Mar 2010 00:08:16 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o2208G2h024542 for ; Tue, 2 Mar 2010 00:08:16 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o2208GMP024541; Tue, 2 Mar 2010 00:08:16 GMT (envelope-from nobody) Message-Id: <201003020008.o2208GMP024541@www.freebsd.org> Date: Tue, 2 Mar 2010 00:08:16 GMT From: Alexander Best To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 X-Mailman-Approved-At: Tue, 02 Mar 2010 00:23:54 +0000 Cc: Subject: amd64/144405: [patch] include /usr/obj/lib32 in cleanworld target on amd64 arch X-BeenThere: freebsd-amd64@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting FreeBSD to the AMD64 platform List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Mar 2010 00:10:07 -0000 >Number: 144405 >Category: amd64 >Synopsis: [patch] include /usr/obj/lib32 in cleanworld target on amd64 arch >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-amd64 >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Mar 02 00:10:07 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Alexander Best >Release: 9.0-CURRENT >Organization: >Environment: FreeBSD otaku 9.0-CURRENT FreeBSD 9.0-CURRENT #2 r204494M: Mon Mar 1 02:00:14 CET 2010 root@otaku:/usr/obj/usr/src/sys/ARUNDEL amd64 >Description: the patch includes /usr/obj/lib32 in the cleanworld target. the patch only scrubs the directory if it's present (which means cleanworld on anything != amd64 won't change). the patch also honours envar MAKEOBJDIRPREFIX. this was discussed in [1]. cheers. alex [1] http://lists.freebsd.org/pipermail/freebsd-hackers/2010-February/030806.html >How-To-Repeat: `cd /usr/src && make cleanworld` => /usr/obj/usr/src gets scrubbed, but /usr/obj/lib32/usr/src doesn't. >Fix: Patch attached with submission follows: Index: Makefile =================================================================== --- Makefile (revision 204540) +++ Makefile (working copy) @@ -159,6 +159,11 @@ -chflags -R 0 ${.OBJDIR} rm -rf ${.OBJDIR}/* .endif +.if exists(${MAKEOBJDIRPREFIX}/lib32${.CURDIR}/) + -rm -rf ${MAKEOBJDIRPREFIX}/lib32${.CURDIR}/* + -chflags -R 0 ${MAKEOBJDIRPREFIX}/lib32${.CURDIR} + rm -rf ${MAKEOBJDIRPREFIX}/lib32${.CURDIR}/* +.endif # # Handle the user-driven targets, using the source relative mk files. >Release-Note: >Audit-Trail: >Unformatted: