This commit is contained in:
Shlomi Fish 2022-08-02 04:07:22 +03:00
parent b78951b5b1
commit ab5083092b
2 changed files with 44 additions and 0 deletions

View File

@ -0,0 +1,39 @@
diff --git a/fc-solve/source/run-tests.pl b/fc-solve/source/run-tests.pl
index e49988a0f..4575621a7 100644
--- a/fc-solve/source/run-tests.pl
+++ b/fc-solve/source/run-tests.pl
@@ -107,33 +107,7 @@ my %binaries;
} values %{ FC_Solve::Test::Valgrind::Data->get_hash };
use Digest ();
-if ( $FC_Solve::Paths::Base::IS_WIN || $force_rebuild )
-{
- ++$rerun;
-}
-else
-{
- foreach my $prog ( keys %progs )
- {
- say $prog;
- die if !-e $prog;
- foreach my $bin ( $prog, `ldd "$prog"` =~ m# => (\S+)#g )
- {
- say "bin $prog $bin";
- $progs{$prog}{binaries}{$bin} //= (
- $binaries{$bin} //= do
- {
- Digest->new('SHA-256')->addfile($bin)->b64digest;
- }
- );
- }
- my $val = $cache->get( $progs{$prog} );
- if ( !$val )
- {
- ++$rerun;
- }
- }
-}
+++$rerun;
$glob_was_set ||= $exclude_re_s;
sub myglob

View File

@ -7,6 +7,7 @@ Version: 6.6.0
Release: 3%{?dist}
License: MIT
Source0: https://fc-solve.shlomifish.org/downloads/fc-solve/%{name}-%{version}.tar.xz
Patch1: fc-solve-fix-ldd-issue.patch
URL: https://fc-solve.shlomifish.org/
Summary: The Freecell Solver Executable
@ -146,6 +147,7 @@ Freecell Solver from within your programs.
%prep
%setup -q
%patch1 -p3 -b .fix-ldd-check
%build
# The game limit flags are recommended by the PySolFC README.
@ -172,6 +174,9 @@ chmod a-x "$dest/$bn"
find %{buildroot} -name *.a -delete
%changelog
* Tue Aug 02 2022 Shlomi Fish <shlomif@shlomifish.org> 6.6.0-3
- Add fc-solve-fix-ldd-issue.patch to fix run-tests.pl ldd-output processing
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild