Date: Wed, 19 Jul 2000 17:42:52 +0900 From: "Akinori -Aki- MUSHA" <knu@idaemons.org> To: ade@FreeBSD.org Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: ports/devel/automake Makefile ports/devel/automake/patches patch-ad Message-ID: <86zonemrxv.wl@localhost.local.idaemons.org> In-Reply-To: In your message of "Sat, 15 Jul 2000 12:07:48 -0700 (PDT)" <200007151907.MAA75829@freefall.freebsd.org> References: <200007151907.MAA75829@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
At Sat, 15 Jul 2000 12:07:48 -0700 (PDT), aDe wrote: > ade 2000/07/15 12:07:48 PDT > > Modified files: > devel/automake Makefile > Added files: > devel/automake/patches patch-ad > Log: > Persuade automake to look not only in ${PREFIX}/share/aclocal > (ie: ${LOCALBASE}), but also ${X11BASE}/share/aclocal via an extra > patch and some configure-time substitution > > Discussed on: ports (quite a while back) > Original disgusting hack by: ade > Suggested improvements by: asami > Reworked patch by: ade This breaks some pieces of software that runs aclocal with an explicit `-I ${X11BASE}/share/aclocal'. (e.g. my japanese/gnome-icu port does) I'd suggest applying the patch below to avoid scanning a file more than once. Objections? Index: patches/patch-ad =================================================================== RCS file: /home/ncvs/ports/devel/automake/patches/patch-ad,v retrieving revision 1.1 diff -u -r1.1 patch-ad --- patches/patch-ad 2000/07/15 19:07:48 1.1 +++ patches/patch-ad 2000/07/19 08:35:28 @@ -1,5 +1,5 @@ ---- aclocal.in.orig Sun Jan 10 20:35:27 1999 -+++ aclocal.in Sat Jul 15 13:59:55 2000 +--- aclocal.in.orig Mon Jan 11 11:35:27 1999 ++++ aclocal.in Wed Jul 19 17:33:34 2000 @@ -103,7 +103,7 @@ @@ -9,3 +9,31 @@ &scan_configure; if (! $exit_status) { +@@ -266,12 +266,13 @@ + $file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4'); + } + ++ local (@skipinolist) = (); + local ($m4dir); + foreach $m4dir (@dirlist) + { + opendir (DIR, $m4dir) + || die "aclocal: couldn't open directory \`$m4dir': $!\n"; +- local ($file, $fullfile, $expr); ++ local ($file, $fullfile, $ino, $expr); + foreach $file (sort grep (! /^\./, readdir (DIR))) + { + # Only examine .m4 files. +@@ -281,6 +282,12 @@ + next if $file eq 'aclocal.m4'; + + $fullfile = $m4dir . '/' . $file; ++ ++ # Do not scan a file more than once. ++ $ino = (stat($fullfile))[1]; ++ next if grep($ino eq $_, @skipinolist); ++ push @skipinolist, $ino; ++ + $file_contents{$fullfile} = &scan_file ($fullfile); + } + closedir (DIR); -- / /__ __ / ) ) ) ) / Akinori -Aki- MUSHA aka / (_ / ( (__( @ idaemons.org / FreeBSD.org "We're only at home when we're on the run, on the wing, on the fly" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86zonemrxv.wl>