[build, doc] Avoid File::Glob in in make_sunver.pl (PR bootstrap/48135)
Rainer Orth
ro@CeBiTec.Uni-Bielefeld.DE
Mon Mar 21 11:41:00 GMT 2011
Prompted by PR bootstrap/48135, I had a closer look at make_sunver.pl
and noticed that it doesn't use File::Glob at all, but turns globs in
the input version script into a regular expression for matching.
Therefore, the requirement of a Perl version newer than what is bundled
in Solaris 8 should go away.
The same seems to apply to libstdc++-v3/scripts/make_exports.pl, but I
haven't touched that file since I cannot test it.
The patch below was tested by a i386-pc-solaris2.11 bootstrap and
verifying that all version scripts were identical to their counterparts
with File::Glob included.
Will apply to mainline soon and probably backport to 4.6.1 later once
I've verified that using perl 5.005 from Solaris 8 really works.
Rainer
2011-03-19 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
contrib:
PR bootstrap/48135
* make_sunver.pl: Don't use File::Glob.
gcc:
PR bootstrap/48135
* doc/install.texi (Prerequisites, Perl): Remove Glob.pm
reference. Solaris 8 perl works.
diff -r cc5961e4e5eb contrib/make_sunver.pl
--- a/contrib/make_sunver.pl Sat Mar 19 22:44:56 2011 +0100
+++ b/contrib/make_sunver.pl Sat Mar 19 22:57:20 2011 +0100
@@ -16,7 +16,6 @@
# It depends on the GNU version of c++filt, since it must understand the
# GNU mangling style.
-use File::Glob ':glob';
use FileHandle;
use IPC::Open2;
diff -r cc5961e4e5eb gcc/doc/install.texi
--- a/gcc/doc/install.texi Sat Mar 19 22:44:56 2011 +0100
+++ b/gcc/doc/install.texi Sat Mar 19 22:57:20 2011 +0100
@@ -308,10 +308,8 @@
Necessary when targetting Darwin, building @samp{libstdc++},
and not using @option{--disable-symvers}.
Necessary when targetting Solaris 2 with Sun @command{ld} and not using
-@option{--disable-symvers}. A helper
-script needs @samp{Glob.pm}, which is missing from @command{perl} 5.005
-included in Solaris@tie{}8. The bundled @command{perl} in Solaris@tie{}9 and up
-works.
+@option{--disable-symvers}. The bundled @command{perl} in Solaris@tie{}8
+and up works.
Necessary when regenerating @file{Makefile} dependencies in libiberty.
Necessary when regenerating @file{libiberty/functions.texi}.
--
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University
More information about the Gcc-patches
mailing list