Date: Sun, 31 Jul 2005 19:02:05 -0600 (MDT) From: "M. Warner Losh" <imp@bsdimp.com> To: jeremie@le-hen.org 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 Message-ID: <20050731.190205.66727472.imp@bsdimp.com> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
In message: <20050801000209.GZ68965@obiwan.tataz.chchile.org>
Jeremie Le Hen <jeremie@le-hen.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050731.190205.66727472.imp>