From a6a0844f535a158c60c547b982971afb38c35b5b Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Wed, 6 Jun 2001 08:29:55 +0000 Subject: Avoid hard coded perl version in list files, use PERL_VERSION magic string instead. --- perl-install/Makefile | 8 ++-- perl-install/share/list | 100 ++++++++++++++++++++++++------------------------ 2 files changed, 53 insertions(+), 55 deletions(-) diff --git a/perl-install/Makefile b/perl-install/Makefile index e89af3dab..f5e855c26 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -54,12 +54,10 @@ install_pms: $(DIRS) get_needed_files: $(DIRS) # export PERL_INSTALL_TEST=1 ; strace -f -e trace=file -o '| grep -v "(No such file or directory)" | sed -e "s/[^\"]*\"//" -e "s/\".*//" | grep "^/" | grep -v -e "^/tmp" -e "^/home" -e "^/proc" -e "^/var" -e "^/dev" -e "^/etc" -e "^/usr/lib/rpm" > /tmp/list ' $(PERL) -d install2 < /dev/null - perl -pe "s/ARCH/$(ARCH)/g" share/list > /tmp/list + eval `perl -V:version`; \ + cat share/list `../tools/specific_arch share/list` | \ + perl -pe "s/ARCH/$(ARCH)/g" | perl -pe "s/PERL_VERSION/$$version/g" > /tmp/list -# perl -pi -e 's/00503/6.0/g' /tmp/list -# see also /usr/lib/perl5/5.00503/ARCH-linux/Data/Dumper.pm - - cat `../tools/specific_arch share/list` >> /tmp/list @missing=`perl -lne 'print if !-e $$_' /tmp/list`; [ -z "$$missing" ] || { echo "missing files vvvvvvvvvvvvvvvvvvvvvvvvvv" ; echo "$$missing" ; echo "missing files ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" ; exit 1; } find auto -follow -name "*.so" >> /tmp/list diff --git a/perl-install/share/list b/perl-install/share/list index 7086cdddb..b8c014371 100644 --- a/perl-install/share/list +++ b/perl-install/share/list @@ -56,50 +56,50 @@ /usr/lib/gtk/themes/engines/libpixmap.so /usr/lib/gtk/themes/engines/libpixmap.la /usr/lib/libimlib-png.so -/usr/lib/perl5/5.6.1/AutoLoader.pm -/usr/lib/perl5/5.6.1/Carp.pm -/usr/lib/perl5/5.6.1/Carp/Heavy.pm -/usr/lib/perl5/5.6.1/Exporter.pm -/usr/lib/perl5/5.6.1/Exporter/Heavy.pm -/usr/lib/perl5/5.6.1/FileHandle.pm -/usr/lib/perl5/5.6.1/SelectSaver.pm -/usr/lib/perl5/5.6.1/SelfLoader.pm -/usr/lib/perl5/5.6.1/Symbol.pm -/usr/lib/perl5/5.6.1/Time/Local.pm -/usr/lib/perl5/5.6.1/IO/Socket/INET.pm -/usr/lib/perl5/5.6.1/IO/Socket/UNIX.pm -/usr/lib/perl5/5.6.1/dumpvar.pl -/usr/lib/perl5/5.6.1/warnings.pm -/usr/lib/perl5/5.6.1/warnings/register.pm -/usr/lib/perl5/5.6.1/ARCH-linux/File/Glob.pm -/usr/lib/perl5/5.6.1/ARCH-linux/auto/File/Glob/Glob.so -/usr/lib/perl5/5.6.1/ARCH-linux/Config.pm -/usr/lib/perl5/5.6.1/ARCH-linux/Data/Dumper.pm -/usr/lib/perl5/5.6.1/ARCH-linux/DynaLoader.pm -/usr/lib/perl5/5.6.1/ARCH-linux/Errno.pm -/usr/lib/perl5/5.6.1/ARCH-linux/Fcntl.pm -/usr/lib/perl5/5.6.1/ARCH-linux/XSLoader.pm -/usr/lib/perl5/5.6.1/ARCH-linux/auto/Fcntl/Fcntl.so -/usr/lib/perl5/5.6.1/ARCH-linux/IO.pm -/usr/lib/perl5/5.6.1/ARCH-linux/IO/File.pm -/usr/lib/perl5/5.6.1/ARCH-linux/IO/Handle.pm -/usr/lib/perl5/5.6.1/ARCH-linux/IO/Seekable.pm -/usr/lib/perl5/5.6.1/ARCH-linux/IO/Select.pm -/usr/lib/perl5/5.6.1/ARCH-linux/IO/Socket.pm -/usr/lib/perl5/5.6.1/ARCH-linux/Socket.pm -/usr/lib/perl5/5.6.1/ARCH-linux/_h2ph_pre.ph -/usr/lib/perl5/5.6.1/ARCH-linux/asm/unistd.ph -/usr/lib/perl5/5.6.1/ARCH-linux/auto/Data/Dumper/Dumper.so -/usr/lib/perl5/5.6.1/ARCH-linux/auto/IO/IO.so -/usr/lib/perl5/5.6.1/ARCH-linux/auto/Socket/Socket.so -/usr/lib/perl5/5.6.1/ARCH-linux/bits/syscall.ph -/usr/lib/perl5/5.6.1/ARCH-linux/sys/syscall.ph -/usr/lib/perl5/5.6.1/ARCH-linux/syscall.ph -/usr/lib/perl5/5.6.1/ARCH-linux/auto/DynaLoader/dl_findfile.al -/usr/lib/perl5/5.6.1/lib.pm -/usr/lib/perl5/5.6.1/overload.pm -/usr/lib/perl5/5.6.1/strict.pm -/usr/lib/perl5/5.6.1/vars.pm +/usr/lib/perl5/PERL_VERSION/AutoLoader.pm +/usr/lib/perl5/PERL_VERSION/Carp.pm +/usr/lib/perl5/PERL_VERSION/Carp/Heavy.pm +/usr/lib/perl5/PERL_VERSION/Exporter.pm +/usr/lib/perl5/PERL_VERSION/Exporter/Heavy.pm +/usr/lib/perl5/PERL_VERSION/FileHandle.pm +/usr/lib/perl5/PERL_VERSION/SelectSaver.pm +/usr/lib/perl5/PERL_VERSION/SelfLoader.pm +/usr/lib/perl5/PERL_VERSION/Symbol.pm +/usr/lib/perl5/PERL_VERSION/Time/Local.pm +/usr/lib/perl5/PERL_VERSION/IO/Socket/INET.pm +/usr/lib/perl5/PERL_VERSION/IO/Socket/UNIX.pm +/usr/lib/perl5/PERL_VERSION/dumpvar.pl +/usr/lib/perl5/PERL_VERSION/warnings.pm +/usr/lib/perl5/PERL_VERSION/warnings/register.pm +/usr/lib/perl5/PERL_VERSION/ARCH-linux/File/Glob.pm +/usr/lib/perl5/PERL_VERSION/ARCH-linux/auto/File/Glob/Glob.so +/usr/lib/perl5/PERL_VERSION/ARCH-linux/Config.pm +/usr/lib/perl5/PERL_VERSION/ARCH-linux/Data/Dumper.pm +/usr/lib/perl5/PERL_VERSION/ARCH-linux/DynaLoader.pm +/usr/lib/perl5/PERL_VERSION/ARCH-linux/Errno.pm +/usr/lib/perl5/PERL_VERSION/ARCH-linux/Fcntl.pm +/usr/lib/perl5/PERL_VERSION/ARCH-linux/XSLoader.pm +/usr/lib/perl5/PERL_VERSION/ARCH-linux/auto/Fcntl/Fcntl.so +/usr/lib/perl5/PERL_VERSION/ARCH-linux/IO.pm +/usr/lib/perl5/PERL_VERSION/ARCH-linux/IO/File.pm +/usr/lib/perl5/PERL_VERSION/ARCH-linux/IO/Handle.pm +/usr/lib/perl5/PERL_VERSION/ARCH-linux/IO/Seekable.pm +/usr/lib/perl5/PERL_VERSION/ARCH-linux/IO/Select.pm +/usr/lib/perl5/PERL_VERSION/ARCH-linux/IO/Socket.pm +/usr/lib/perl5/PERL_VERSION/ARCH-linux/Socket.pm +/usr/lib/perl5/PERL_VERSION/ARCH-linux/_h2ph_pre.ph +/usr/lib/perl5/PERL_VERSION/ARCH-linux/asm/unistd.ph +/usr/lib/perl5/PERL_VERSION/ARCH-linux/auto/Data/Dumper/Dumper.so +/usr/lib/perl5/PERL_VERSION/ARCH-linux/auto/IO/IO.so +/usr/lib/perl5/PERL_VERSION/ARCH-linux/auto/Socket/Socket.so +/usr/lib/perl5/PERL_VERSION/ARCH-linux/bits/syscall.ph +/usr/lib/perl5/PERL_VERSION/ARCH-linux/sys/syscall.ph +/usr/lib/perl5/PERL_VERSION/ARCH-linux/syscall.ph +/usr/lib/perl5/PERL_VERSION/ARCH-linux/auto/DynaLoader/dl_findfile.al +/usr/lib/perl5/PERL_VERSION/lib.pm +/usr/lib/perl5/PERL_VERSION/overload.pm +/usr/lib/perl5/PERL_VERSION/strict.pm +/usr/lib/perl5/PERL_VERSION/vars.pm /usr/lib/perl5/site_perl/5.6.0/Net/Cmd.pm /usr/lib/perl5/site_perl/5.6.0/Net/Config.pm /usr/lib/perl5/site_perl/5.6.0/Net/FTP.pm @@ -107,12 +107,12 @@ /usr/lib/perl5/site_perl/5.6.0/Net/FTP/I.pm /usr/lib/perl5/site_perl/5.6.0/Net/FTP/dataconn.pm /usr/lib/perl5/site_perl/5.6.0/Net/Netrc.pm -/usr/lib/perl5/site_perl/5.6.1/ARCH-linux/packdrake.pm -/usr/lib/perl5/site_perl/5.6.1/ARCH-linux/Gtk.pm -/usr/lib/perl5/site_perl/5.6.1/ARCH-linux/Gtk/Types.pm -/usr/lib/perl5/site_perl/5.6.1/ARCH-linux/Gtk/Gdk/ImlibImage.pm -/usr/lib/perl5/site_perl/5.6.1/ARCH-linux/auto/Gtk/Gtk.so -/usr/lib/perl5/site_perl/5.6.1/ARCH-linux/auto/Gtk/Gdk/ImlibImage/ImlibImage.so +/usr/lib/perl5/site_perl/PERL_VERSION/ARCH-linux/packdrake.pm +/usr/lib/perl5/site_perl/PERL_VERSION/ARCH-linux/Gtk.pm +/usr/lib/perl5/site_perl/PERL_VERSION/ARCH-linux/Gtk/Types.pm +/usr/lib/perl5/site_perl/PERL_VERSION/ARCH-linux/Gtk/Gdk/ImlibImage.pm +/usr/lib/perl5/site_perl/PERL_VERSION/ARCH-linux/auto/Gtk/Gtk.so +/usr/lib/perl5/site_perl/PERL_VERSION/ARCH-linux/auto/Gtk/Gdk/ImlibImage/ImlibImage.so /usr/lib/rpm/rpmrc /usr/lib/rpm/macros /usr/sbin/rescuept -- cgit v1.2.1