[svn:parrot] r43719 - in trunk: . config/init lib/Parrot/Configure/Options/Conf

darbelo at svn.parrot.org darbelo at svn.parrot.org
Thu Feb 4 23:31:53 UTC 2010


Author: darbelo
Date: Thu Feb  4 23:31:50 2010
New Revision: 43719
URL: https://trac.parrot.org/parrot/changeset/43719

Log:
Make the used hints file overridable on the Configure.pl command line.

Modified:
   trunk/Configure.pl
   trunk/config/init/hints.pm
   trunk/lib/Parrot/Configure/Options/Conf/Shared.pm

Modified: trunk/Configure.pl
==============================================================================
--- trunk/Configure.pl	Thu Feb  4 21:46:23 2010	(r43718)
+++ trunk/Configure.pl	Thu Feb  4 23:31:50 2010	(r43719)
@@ -201,6 +201,10 @@
 
 =over 4
 
+=item C<--hintsfile=filename>
+
+Use filename as the hints file.
+
 =item C<--darwin_no_fink>
 
 On Darwin, do not probe for Fink libraries.

Modified: trunk/config/init/hints.pm
==============================================================================
--- trunk/config/init/hints.pm	Thu Feb  4 21:46:23 2010	(r43718)
+++ trunk/config/init/hints.pm	Thu Feb  4 23:31:50 2010	(r43719)
@@ -35,12 +35,16 @@
     print "\n[ " if $verbose;
 
     my $hints_used = 0;
+    my $hints_file;
 
     my $osname = lc( $conf->data->get('OSNAME_provisional') );
     $osname = 'linux' if ($osname eq 'gnukfreebsd');
-    my $hints_file = catfile('config', 'init', 'hints', "$osname.pm");
+
+    my $hints_file_name = $conf->options->get('hintsfile') || $osname ;
+    $hints_file = catfile('config', 'init', 'hints', "$hints_file_name.pm");
+
     if ( -f $hints_file ) {
-        my $hints_pkg = "init::hints::" . $osname;
+        my $hints_pkg = "init::hints::" . $hints_file_name;
 
         print "$hints_pkg " if $verbose;
 

Modified: trunk/lib/Parrot/Configure/Options/Conf/Shared.pm
==============================================================================
--- trunk/lib/Parrot/Configure/Options/Conf/Shared.pm	Thu Feb  4 21:46:23 2010	(r43718)
+++ trunk/lib/Parrot/Configure/Options/Conf/Shared.pm	Thu Feb  4 23:31:50 2010	(r43719)
@@ -30,6 +30,7 @@
     fatal-step
     floatval
     help
+    hintsfile
     icu-config
     icuheaders
     icushared


More information about the parrot-commits mailing list