On Thu, 02.12.2010 at 15:45:22 +0100, Alexander Leidinger wrote:
> Quoting Ulrich Spoerlein <u...@freebsd.org> (from Thu, 2 Dec 2010
> 10:46:05 +0000 (UTC)):
>
> > Author: uqs
> > Date: Thu Dec 2 10:46:05 2010
> > New Revision: 216119
> > URL: http://svn.freebsd.org/changeset/base/216119
> >
> > Log:
> > Remove more duplicates.
> >
> > Just so that I can lookup the command for the next time:
>
> Can you please add it to OldFiles.inc instead, with a comment what it does?
>
> > for t in `make -V TARGETS universe`; do
> > __MAKE_CONF=/dev/null make -f Makefile.inc1 -m $PWD/share/mk TARGET=$t \
> > -V OLD_FILES -V OLD_LIBS -V OLD_DIRS delete-old | \
> > xargs -n1|sort|uniq -c|egrep -v "^ *1 ";
> > done
>
> While it does not matter for "-V OLD*", the spirit of the command is
> more like the check-old target (which is including shared libs) than
> the delete-old target (which does not delete shared libs but only
> static libs). Using check-old would also remove the (wrong, but not
> far fetched) fear of actually deleting something with this command.
Something that bugs me more, is all the TARGET_ARCH conditionals in that
file, that serve practically no purpose. If a file only existed on i386,
and it has been removed on i386, there's no point in wrapping this under
TARGET_ARCH=i386. The wrapping of all lib32 files for amd64 is a great
example :/
The wrapping is only ever required, if some file has been removed from a
set of arches, but must be retained on others.
Anyway, please see attached.
Uli
commit 2c5b79ffde80760690baee61d30b0f533e511ca3
Author: Ulrich Spörlein <u...@spoerlein.net>
Date: Thu Dec 2 21:23:58 2010 +0100
Document two more ways to find duplicates in the obsolete file list.
Remove the only duplicate found by the optional files check. Fix typos,
while here.
Suggested by: netchild
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 0756547..e406532 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -22,16 +22,31 @@
# grep '+=' /usr/src/tools/build/mk/OptionalObsoleteFiles.inc | sort -u) | \
# sort | uniq -d
#
+# To find regular duplicates not dependant on optional components, you can
+# also use something that will not give you false positives, e.g.:
+# for t in `make -V TARGETS universe`; do
+# __MAKE_CONF=/dev/null make -f Makefile.inc1 TARGET=$t \
+# -V OLD_FILES -V OLD_LIBS -V OLD_DIRS check-old | \
+# xargs -n1 | sort | uniq -d;
+# done
+#
+# For optional components, you can use the following to see if some entries
+# in OptionalObsoleteFiles.inc have been obsoleted by ObsoleteFiles.inc
+# for o in tools/build/options/WITH*; do
+# __MAKE_CONF=/dev/null make -f Makefile.inc1 -D${o##*/} \
+# -V OLD_FILES -V OLD_LIBS -V OLD_DIRS check-old | \
+# xargs -n1 | sort | uniq -d;
+# done
# 20101112: vgonel(9) has gone to private API a while ago
OLD_FILES+=usr/share/man/man9/vgonel.9.gz
# 20101112: removed gasp.info
OLD_FILES+=usr/share/info/gasp.info.gz
-# 20101109: headers moved to machine/ to x86/
+# 20101109: headers moved from machine/ to x86/
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
OLD_FILES+=usr/include/machine/mptable.h
.endif
-# 20101101: headers moved to machine/ to x86/
+# 20101101: headers moved from machine/ to x86/
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
OLD_FILES+=usr/include/machine/apicreg.h
OLD_FILES+=usr/include/machine/mca.h
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 02a4ce3..db8251c 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1869,7 +1869,6 @@ OLD_FILES+=usr/lib/libfl_p.a
OLD_FILES+=usr/lib/libform_p.a
OLD_FILES+=usr/lib/libformw_p.a
OLD_FILES+=usr/lib/libftpio_p.a
-OLD_FILES+=usr/lib/libg2c_p.a
OLD_FILES+=usr/lib/libgcc_p.a
OLD_FILES+=usr/lib/libgeom_p.a
OLD_FILES+=usr/lib/libgnuregex_p.a
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
