Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

undo efc70eb6d7c3755ca7b6e6293439463f2c80b032

volth 7980e04d eedd4746

+19 -21
+19 -21
pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch
··· 16 16 index 505d1df..fc38b76 100644 17 17 --- a/Makefile.PL 18 18 +++ b/Makefile.PL 19 - @@ -28,12 +28,18 @@ foreach (@ARGV) { 19 + @@ -29,12 +29,17 @@ foreach (@ARGV) { 20 20 @ARGV = @replacement_args; 21 21 22 22 unless ( 23 - - check_lib( # fill in what you prompted the user for here 24 - - lib => [qw(expat)], 25 - - header => ['expat.h'], 26 - - incpath => $expat_incpath, 27 - - ($expat_libpath? 28 - - (libpath => $expat_libpath):()), 29 - - )) { 30 - + #check_lib( # fill in what you prompted the user for here 31 - + # lib => [qw(expat)], 32 - + # header => ['expat.h'], 33 - + # incpath => $expat_incpath, 34 - + # ($expat_libpath? 35 - + # (libpath => $expat_libpath):()), 36 - + #) 37 - + # The check_lib implementation fails horribly with cross-compilation. 38 - + # We are giving known good paths to expat. 39 - + # And in all cases, the previous behaviour of not actually failing 40 - + # seemed to work just fine :/. 41 - + false 42 - + ) { 23 + - check_lib( # fill in what you prompted the user for here 24 + - lib => [qw(expat)], 25 + - header => ['expat.h'], 26 + - incpath => $expat_incpath, 27 + - ( $expat_libpath ? ( libpath => $expat_libpath ) : () ), 28 + - ) 29 + + #check_lib( # fill in what you prompted the user for here 30 + + # lib => [qw(expat)], 31 + + # header => ['expat.h'], 32 + + # incpath => $expat_incpath, 33 + + # ( $expat_libpath ? ( libpath => $expat_libpath ) : () ), 34 + + #) 35 + + # The check_lib implementation fails horribly with cross-compilation. 36 + + # We are giving known good paths to expat. 37 + + # And in all cases, the previous behaviour of not actually failing 38 + + # seemed to work just fine :/. 39 + + false 40 + ) { 43 41 warn <<'Expat_Not_Installed;'; 44 42 45 43 --