From ab5083092bfe6793333fbf9871ec90a6ff515fc7 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Aug 02 2022 01:07:22 +0000 Subject: ldd fix --- diff --git a/fc-solve-fix-ldd-issue.patch b/fc-solve-fix-ldd-issue.patch new file mode 100644 index 0000000..a628a1c --- /dev/null +++ b/fc-solve-fix-ldd-issue.patch @@ -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 diff --git a/freecell-solver.spec b/freecell-solver.spec index 1bf1e8a..da598ef 100644 --- a/freecell-solver.spec +++ b/freecell-solver.spec @@ -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 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 - 6.6.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild