diff options
| author | volth <volth@volth.com> | 2020-09-07 15:37:24 +0000 |
|---|---|---|
| committer | volth <volth@volth.com> | 2020-09-09 09:16:24 +0000 |
| commit | 5481e02ebad0425488697f15c21eb8dca28cb5d3 (patch) | |
| tree | 432768a801b4a2fb248bcb87f7d6c9e2a1d3660b /pkgs/development/perl-modules | |
| parent | 40fee55bae78358bd1b04dc6b42c20bdb5d8799a (diff) | |
undo efc70eb6d7c3755ca7b6e6293439463f2c80b032
Diffstat (limited to 'pkgs/development/perl-modules')
| -rw-r--r-- | pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch b/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch index f66ed0dfe019..add6d9df3b7f 100644 --- a/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch +++ b/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch @@ -16,30 +16,28 @@ diff --git a/Makefile.PL b/Makefile.PL index 505d1df..fc38b76 100644 --- a/Makefile.PL +++ b/Makefile.PL -@@ -28,12 +28,18 @@ foreach (@ARGV) { +@@ -29,12 +29,17 @@ foreach (@ARGV) { @ARGV = @replacement_args; unless ( -- check_lib( # fill in what you prompted the user for here -- lib => [qw(expat)], -- header => ['expat.h'], -- incpath => $expat_incpath, -- ($expat_libpath? -- (libpath => $expat_libpath):()), -- )) { -+ #check_lib( # fill in what you prompted the user for here -+ # lib => [qw(expat)], -+ # header => ['expat.h'], -+ # incpath => $expat_incpath, -+ # ($expat_libpath? -+ # (libpath => $expat_libpath):()), -+ #) -+ # The check_lib implementation fails horribly with cross-compilation. -+ # We are giving known good paths to expat. -+ # And in all cases, the previous behaviour of not actually failing -+ # seemed to work just fine :/. -+ false -+ ) { +- check_lib( # fill in what you prompted the user for here +- lib => [qw(expat)], +- header => ['expat.h'], +- incpath => $expat_incpath, +- ( $expat_libpath ? ( libpath => $expat_libpath ) : () ), +- ) ++ #check_lib( # fill in what you prompted the user for here ++ # lib => [qw(expat)], ++ # header => ['expat.h'], ++ # incpath => $expat_incpath, ++ # ( $expat_libpath ? ( libpath => $expat_libpath ) : () ), ++ #) ++ # The check_lib implementation fails horribly with cross-compilation. ++ # We are giving known good paths to expat. ++ # And in all cases, the previous behaviour of not actually failing ++ # seemed to work just fine :/. ++ false + ) { warn <<'Expat_Not_Installed;'; -- |