From owner-p4-projects@FreeBSD.ORG Mon Oct 11 22:34:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E7E616A4D1; Mon, 11 Oct 2004 22:34:14 +0000 (GMT) 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 794EB16A4CE for ; Mon, 11 Oct 2004 22:34:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A64543D2D for ; Mon, 11 Oct 2004 22:34:14 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9BMYE7i033177 for ; Mon, 11 Oct 2004 22:34:14 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9BMYE4X033174 for perforce@freebsd.org; Mon, 11 Oct 2004 22:34:14 GMT (envelope-from peter@freebsd.org) Date: Mon, 11 Oct 2004 22:34:14 GMT Message-Id: <200410112234.i9BMYE4X033174@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63026 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Oct 2004 22:34:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=63026 Change 63026 by peter@peter_daintree on 2004/10/11 22:33:20 IFC @63024 (oops, used wrong number last time) Affected files ... .. //depot/projects/hammer/lib/libarchive/Makefile#13 integrate .. //depot/projects/hammer/lib/libkvm/kvm_proc.c#26 integrate .. //depot/projects/hammer/tools/lib32/build32.sh#6 integrate Differences ... ==== //depot/projects/hammer/lib/libarchive/Makefile#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.22 2004/09/01 05:07:17 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.23 2004/10/11 22:04:05 obrien Exp $ # # Use "make distfile" to build a conventional tar.gz archive @@ -21,10 +21,6 @@ WARNS?= 6 .endif -# I'm not yet ready for a shared version of this library, as -# there are a couple of API changes still in the works. -NOPIC= 1 - INCS= archive.h archive_entry.h # Note: archive.h does need to be listed here, since it's built ==== //depot/projects/hammer/lib/libkvm/kvm_proc.c#26 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.81 2004/10/06 17:10:56 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.82 2004/10/11 21:56:27 peter Exp $"); /* * Proc traversal interface for kvm. ps and w are (probably) the exclusive ==== //depot/projects/hammer/tools/lib32/build32.sh#6 (text+ko) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# $FreeBSD: src/tools/lib32/build32.sh,v 1.6 2004/09/16 01:41:11 peter Exp $ +# $FreeBSD: src/tools/lib32/build32.sh,v 1.7 2004/10/11 22:14:47 peter Exp $ # # 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. @@ -66,3 +66,5 @@ make -s -DNOMAN -DNODOC -DNOINFO -k depend make -s -DNOMAN -DNODOC -DNOINFO -k make -s -DNOMAN -DNODOC -DNOINFO -k install + +chflags -R noschg $MAKEOBJDIRPREFIX