diff options
Diffstat (limited to 'upstream-build/configdata.pm/x86_64-macos')
| -rw-r--r-- | upstream-build/configdata.pm/x86_64-macos | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/upstream-build/configdata.pm/x86_64-macos b/upstream-build/configdata.pm/x86_64-macos index 6b5cf94..4b10638 100644 --- a/upstream-build/configdata.pm/x86_64-macos +++ b/upstream-build/configdata.pm/x86_64-macos @@ -111,8 +111,8 @@ our %config = ( sourcedir => "..", target => "darwin64-x86_64-cc", tdirs => [ "ossl_shim" ], - version => "1.1.1i", - version_num => "0x1010109fL", + version => "1.1.1j", + version_num => "0x101010afL", ); our %target = ( @@ -10706,9 +10706,7 @@ our %unified_info = ( "test/cmactest.o" => [ "include", - "apps/include", "../include", - "../apps/include", ], "test/cmsapitest.o" => [ @@ -17163,19 +17161,22 @@ _____ } print "\nEnabled features:\n\n"; foreach my $what (@disablables) { - print " $what\n" unless $disabled{$what}; + print " $what\n" + unless grep { $_ =~ /^${what}$/ } keys %disabled; } print "\nDisabled features:\n\n"; foreach my $what (@disablables) { - if ($disabled{$what}) { - print " $what", ' ' x ($longest - length($what) + 1), - "[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1); - print $disabled_info{$what}->{macro} - if $disabled_info{$what}->{macro}; + my @what2 = grep { $_ =~ /^${what}$/ } keys %disabled; + my $what3 = $what2[0]; + if ($what3) { + print " $what3", ' ' x ($longest - length($what3) + 1), + "[$disabled{$what3}]", ' ' x ($longest2 - length($disabled{$what3}) + 1); + print $disabled_info{$what3}->{macro} + if $disabled_info{$what3}->{macro}; print ' (skip ', - join(', ', @{$disabled_info{$what}->{skipped}}), + join(', ', @{$disabled_info{$what3}->{skipped}}), ')' - if $disabled_info{$what}->{skipped}; + if $disabled_info{$what3}->{skipped}; print "\n"; } } |