From owner-p4-projects@FreeBSD.ORG  Mon Apr 28 18:28:08 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 62B3737B404; Mon, 28 Apr 2003 18:28:07 -0700 (PDT)
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 1989637B401
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 18:28:07 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B75B243F93
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 18:28:06 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3T1S60U084663
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 18:28:06 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3T1S6oA084659
	for perforce@freebsd.org; Mon, 28 Apr 2003 18:28:06 -0700 (PDT)
Date: Mon, 28 Apr 2003 18:28:06 -0700 (PDT)
Message-Id: <200304290128.h3T1S6oA084659@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 30019 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: Tue, 29 Apr 2003 01:28:08 -0000

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

Change 30019 by peter@peter_daintree on 2003/04/28 18:27:45

	Avoid libdisk, and libstand for now.  libdisk is actually easy since
	we can just clone the i386 bits.  libstand is more of an issue since
	we use i386 boot code, which means we need a toolchain that can
	produce i386 code...

Affected files ...

.. //depot/projects/hammer/lib/Makefile#6 edit

Differences ...

==== //depot/projects/hammer/lib/Makefile#6 (text+ko) ====

@@ -29,7 +29,7 @@
 	libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \
 	libnetgraph libopie libpam libpanel libpcap ${_libpthread} \
 	${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \
-	libstand ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \
+	${_libstand} ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \
 	libwrap libxpg4 liby libz
 
 .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
@@ -70,10 +70,14 @@
 _compat=	compat
 .endif
 
-.if ${MACHINE_ARCH} != "powerpc"
+.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "amd64"
 _libdisk=libdisk
 .endif
 
+.if ${MACHINE_ARCH} != "amd64"
+_libstand=libstand
+.endif
+
 .if defined(RELEASEDIR) || \
     (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \
     defined(NOCRYPT) || \