From owner-p4-projects@FreeBSD.ORG  Sat Mar 20 18:08:58 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 18FEF16A4D0; Sat, 20 Mar 2004 18:08:58 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B045716A4CE
	for <perforce@freebsd.org>; Sat, 20 Mar 2004 18:08:57 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 90B8C43D39
	for <perforce@freebsd.org>; Sat, 20 Mar 2004 18:08:57 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2L28vGe009725
	for <perforce@freebsd.org>; Sat, 20 Mar 2004 18:08:57 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L28vFx009722
	for perforce@freebsd.org; Sat, 20 Mar 2004 18:08:57 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Sat, 20 Mar 2004 18:08:57 -0800 (PST)
Message-Id: <200403210208.i2L28vFx009722@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 49423 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Mar 2004 02:08:58 -0000

http://perforce.freebsd.org/chv.cgi?CH=49423

Change 49423 by peter@peter_overcee on 2004/03/20 18:08:14

	move lib32 from mtree (where it affects all platforms)
	to the hack build script

Affected files ...

.. //depot/projects/hammer/build32.sh#5 edit
.. //depot/projects/hammer/etc/mtree/BSD.local.dist#16 edit
.. //depot/projects/hammer/etc/mtree/BSD.root.dist#7 edit
.. //depot/projects/hammer/etc/mtree/BSD.usr.dist#20 edit
.. //depot/projects/hammer/etc/mtree/BSD.x11-4.dist#6 edit
.. //depot/projects/hammer/etc/mtree/BSD.x11.dist#3 edit

Differences ...

==== //depot/projects/hammer/build32.sh#5 (text+kox) ====

@@ -1,5 +1,5 @@
 #! /bin/sh
-# $P4: //depot/projects/hammer/build32.sh#4 $
+# $P4: //depot/projects/hammer/build32.sh#5 $
 #
 # This script is for running on a self-hosted amd64 machine, with an up-to-date
 # world and toolchain etc.  ie: the installed world is assumed to match the sources.
@@ -11,6 +11,11 @@
 # XXX installation of includes.  ie: it will re-install some files in
 # XXX /usr/include for you.
 
+mkdir /lib32
+mkdir /usr/lib32
+mkdir /usr/local/lib32
+mkdir /usr/X11R6/lib32
+
 # Set up an obj tree
 chflags -R noschg /tmp/i386
 rm -rf /tmp/i386

==== //depot/projects/hammer/etc/mtree/BSD.local.dist#16 (text+ko) ====

@@ -19,8 +19,6 @@
     ..
     lib
     ..
-    lib32
-    ..
     libdata
     ..
     libexec

==== //depot/projects/hammer/etc/mtree/BSD.root.dist#7 (text+ko) ====

@@ -63,8 +63,6 @@
     ..
     lib
     ..
-    lib32
-    ..
     libexec
     ..
     mnt

==== //depot/projects/hammer/etc/mtree/BSD.usr.dist#20 (text+ko) ====

@@ -19,8 +19,6 @@
             ..
         ..
     ..
-    lib32
-    ..
     libdata
         doscmd
             fonts

==== //depot/projects/hammer/etc/mtree/BSD.x11-4.dist#6 (text+ko) ====

@@ -347,8 +347,6 @@
             ..
         ..
     ..
-    lib32
-    ..
     libdata
         pkgconfig
         ..

==== //depot/projects/hammer/etc/mtree/BSD.x11.dist#3 (text+ko) ====

@@ -191,8 +191,6 @@
         modules
         ..
     ..
-    lib32
-    ..
     libdata
     ..
     libexec