Changeset 10134 for vendors

Timestamp:

2018-09-17T15:05:46+02:00 (6 years ago)

Author:

dguibert

Message:

fcm: fix fortran interface generation with perl 5.12+

this patch applies both patches from:

• ​https://github.com/metomi/fcm/pull/156/commits/393d3e88d38ebce3511508666758c6a1a8a0fd64
• ​https://github.com/matthewrmshin/fcm/commit/062e2c8df52cade01e4d7790c5700980ffd957b3

Location:

vendors/FCM/lib/Fcm

Files:

• BuildSrc.pm (modified) (5 diffs)
• CfgFile.pm (modified) (1 diff)

vendors/FCM/lib/Fcm/BuildSrc.pm

@@ -141 +141 @@
         # Reference to an empty array
         $self->{$name} = [];
-        
+
       } elsif ($name =~ /^(?:is_cur|pkgname|ppsrc|src)$/) {
         # Empty string
         $self->{$name} = '';
-        
+
       } elsif ($name eq 'mtime') {
         # Modification time
         $self->{$name} = (stat $self->src)[9] if $self->src;
-        
+
       } elsif ($name eq 'ppmtime') {
         # Modification time
         $self->{$name} = (stat $self->ppsrc)[9] if $self->ppsrc;
-        
+
       } elsif ($name eq 'type') {
         # Attempt to get the type if src is set
@@ -395 +395 @@
   my $self = shift();
   if (
-        uc($self->get_setting(qw/TOOL GENINTERFACE/)) ne 'NONE'
+        defined($self->get_setting(qw/TOOL GENINTERFACE/))
+    &&  uc($self->get_setting(qw/TOOL GENINTERFACE/)) ne 'NONE'
     &&  $self->progname()
     &&  $self->is_type_all(qw/SOURCE/)
@@ -944 +945 @@
       };
     }
-    
+
     if ($self->interfacebase) {
       # Interface target
@@ -1217 +1218 @@
 sub is_in_package {
   my ($self, $name) = @_;
-  
+
   my $return = 0;
   for (@{ $self->pkgnames }) {
@@ -1410 +1411 @@
 
     $mk .= $target . ':';
-    
+
     if ($rule->{ACTION} eq 'AR') {
       $mk .= ' ' . $self->rule_obj_var (1);

vendors/FCM/lib/Fcm/CfgFile.pm

@@ -232 +232 @@
     }
 
-    if (exists $exp_inc{uc ($self->type)} and
-        uc ($start ? $start->label : $label) eq $self->cfglabel ('INC') and
-        not defined $cont) {
+    if (    defined($self->type())
+        &&  exists($exp_inc{uc($self->type())})
+        &&  uc($start ? $start->label() : $label) eq $self->cfglabel('INC')
+        &&  !defined($cont)
+    ) {
       # Current configuration file requires expansion of INC declarations
       # The start/current line is an INC declaration