From owner-cvs-src@FreeBSD.ORG Mon Aug 1 01:03:50 2005 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F1E0716A426; Mon, 1 Aug 2005 01:03:49 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (vc4-2-0-87.dsl.netrack.net [199.45.160.85]) by mx1.FreeBSD.org (Postfix) with ESMTP id 75E7F43D45; Mon, 1 Aug 2005 01:03:49 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (localhost.village.org [127.0.0.1] (may be forged)) by harmony.bsdimp.com (8.13.3/8.13.3) with ESMTP id j7111F3g088274; Sun, 31 Jul 2005 19:01:15 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Sun, 31 Jul 2005 19:02:05 -0600 (MDT) Message-Id: <20050731.190205.66727472.imp@bsdimp.com> To: jeremie@le-hen.org From: "M. Warner Losh" In-Reply-To: <20050801000209.GZ68965@obiwan.tataz.chchile.org> References: <20050731185925.GU68965@obiwan.tataz.chchile.org> <20050731.164241.119877948.imp@bsdimp.com> <20050801000209.GZ68965@obiwan.tataz.chchile.org> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, netchild@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src Makefile.inc1 ObsoleteFiles.inc src/share/man/man7 build.7 X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2005 01:03:50 -0000 In message: <20050801000209.GZ68965@obiwan.tataz.chchile.org> Jeremie Le Hen writes: : Index: Makefile.inc1 : =================================================================== : RCS file: /donald/repo/FreeBSD/src/Makefile.inc1,v : retrieving revision 1.506 : diff -u -p -u -r1.506 Makefile.inc1 : --- Makefile.inc1 30 Jul 2005 18:02:20 -0000 1.506 : +++ Makefile.inc1 31 Jul 2005 23:39:09 -0000 : @@ -1057,6 +1057,8 @@ par-${__target}: ${SUBDIR:S/$/.${__targe : # check for / delete old files section : # : : +DESTDIR_ARCH!= uname -m : + : .include "ObsoleteFiles.inc" : : OLD_LIBS_MESSAGE="Please be sure no application still uses those libraries, \ : Index: ObsoleteFiles.inc : =================================================================== : RCS file: /donald/repo/FreeBSD/src/ObsoleteFiles.inc,v : retrieving revision 1.7 : diff -u -p -u -r1.7 ObsoleteFiles.inc : --- ObsoleteFiles.inc 30 Jul 2005 18:04:17 -0000 1.7 : +++ ObsoleteFiles.inc 31 Jul 2005 23:39:30 -0000 : @@ -223,7 +223,7 @@ OLD_FILES+=usr/share/man/man1/sasc.1.gz : OLD_FILES+=usr/share/man/man1/sgsc.1.gz : OLD_FILES+=usr/share/man/man4/i386/stl.4.gz : OLD_FILES+=usr/share/man/man8/raidctl.8.gz : -.if ${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "sparc64" : +.if ${DESTDIR_ARCH} != "alpha" && ${DESTDIR_ARCH} != "sparc64" : # 20040130: libkse renamed to libpthread : OLD_FILES+=usr/lib/libkse.a : OLD_FILES+=usr/lib/libkse.so : @@ -636,7 +636,7 @@ OLD_LIBS+=usr/lib/libpcap.so.2 : OLD_LIBS+=usr/lib/libisc.so.1 : # 200408XX : OLD_LIBS+=usr/lib/snmp_netgraph.so.1 : -.if ${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "sparc64" : +.if ${DESTDIR_ARCH} != "alpha" && ${DESTDIR_ARCH} != "sparc64" : # 20040130: libkse renamed to libpthread : OLD_LIBS+=usr/lib/libkse.so.1 : .endif Actually, this patch is wrong. s/DESTDIR_ARCH/TARGET_ARCH/g and you are done, and it fits perfectly with all other uses of TARGET_ARCH in the tree... Why won't that work again? Warner