From cc91ea6d6ebf6ee4349412a3c12173d4b7777f18 Mon Sep 17 00:00:00 2001 From: "Alan J. Wylie" Date: Wed, 5 Jan 2005 11:37:57 +0000 Subject: [PATCH] alanw: man-pages: in the screen: section of the Makefile, when moving man pages that already exist on the system as part of some other package into the not_installed sub-directory, optimise the searching through /var/adm/flists/*, by creating an optimised cache file of all existing man pages. Also tighten up the regular expressions used for searching to reduce false positives. This significantly speeds up the build of man-pages, especially considering the overhead of the fl_wrapper.rlog [2004122018091517280] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5381 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/man-pages/sharedfiles.patch | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/package/base/man-pages/sharedfiles.patch b/package/base/man-pages/sharedfiles.patch index 75d6e0e03..4cead5ee5 100644 --- a/package/base/man-pages/sharedfiles.patch +++ b/package/base/man-pages/sharedfiles.patch @@ -1,15 +1,19 @@ -diff -pruN man-pages-1.67_orig/Makefile man-pages-1.67/Makefile ---- man-pages-1.67_orig/Makefile 2004-05-21 01:35:18.000000000 +0200 -+++ man-pages-1.67/Makefile 2004-10-21 11:41:08.226029864 +0200 -@@ -17,10 +17,8 @@ allbz: bz2 all +diff -Naur man-pages-1.70.orig/Makefile man-pages-1.70/Makefile +--- man-pages-1.70.orig/Makefile 2004-06-24 18:49:38.000000000 +0100 ++++ man-pages-1.70/Makefile 2004-12-20 15:59:05.000000000 +0000 +@@ -16,11 +16,12 @@ + screen: -mkdir not_installed ++ find /var/adm/flists ! -name "man-pages*" | \ ++ xargs grep -hE "/man/man([1-9])/.*\.\1$$" | \ ++ awk '{print $$2}' > not_installed/.MANCACHE; \ for i in man?/*; do \ - if [ $(MANDIR)/"$$i" -nt "$$i" ]; then \ - cmp -s $(MANDIR)/"$$i" "$$i" > /dev/null 2>&1; \ - if [ "$$?" != 0 ]; then mv "$$i" not_installed; fi; \ - fi; \ -+ grep -q "$$i" ` ls /var/adm/flists/* | grep -v man-pages `; \ ++ grep -Fq "/$$i" not_installed/.MANCACHE; \ + if [ "$$?" == 0 ]; then mv "$$i" not_installed; fi; \ done