diff options
| author | John Ericson <git@JohnEricson.me> | 2020-04-07 17:26:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-07 17:26:17 -0400 |
| commit | fd85e86232e36435c760929786ecadb9b855e996 (patch) | |
| tree | 156a91522069a979c4a44cb4e3f3d20b5bee8dc2 /pkgs/development/perl-modules | |
| parent | 84867e44bfb072ea03ed8f7c290a1a577441f509 (diff) | |
| parent | 706247fd107dc7048d38aeabec83f7ffe0df5879 (diff) | |
| download | nixlib-fd85e86232e36435c760929786ecadb9b855e996.tar nixlib-fd85e86232e36435c760929786ecadb9b855e996.tar.gz nixlib-fd85e86232e36435c760929786ecadb9b855e996.tar.bz2 nixlib-fd85e86232e36435c760929786ecadb9b855e996.tar.lz nixlib-fd85e86232e36435c760929786ecadb9b855e996.tar.xz nixlib-fd85e86232e36435c760929786ecadb9b855e996.tar.zst nixlib-fd85e86232e36435c760929786ecadb9b855e996.zip | |
Merge pull request #75132 from samueldr/fix/cross/perl-xmlparser
perlPackages.XMLParser: Work around cross-compilation regression
Diffstat (limited to 'pkgs/development/perl-modules')
| -rw-r--r-- | pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch | 45 |
1 files changed, 45 insertions, 0 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 new file mode 100644 index 000000000000..add6d9df3b7f --- /dev/null +++ b/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch @@ -0,0 +1,45 @@ +From e996904128653c67b04ddbdb1e10cef158098957 Mon Sep 17 00:00:00 2001 +From: Samuel Dionne-Riel <samuel@dionne-riel.com> +Date: Fri, 6 Dec 2019 23:00:51 -0500 +Subject: [PATCH] [HACK]: Assumes Expat paths are good. + +The `check_lib` check fails with the cross-compilation build platform's +Perl, since apparently `mktemp` is missing... + +Even then, side-stepping the issue, it seems it is not actually enough +to work, as the compilation fails. +--- + Makefile.PL | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/Makefile.PL b/Makefile.PL +index 505d1df..fc38b76 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -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 + ) { + warn <<'Expat_Not_Installed;'; + +-- +2.23.0 + |