public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #75132 from samueldr/fix/cross/perl-xmlparser

Browse Source 
perlPackages.XMLParser: Work around cross-compilation regression
This commit is contained in:
John Ericson 2020-04-07 17:26:17 -04:00 committed by GitHub
commit fd85e86232
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch Normal file
View File

@ -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

3
pkgs/top-level/perl-packages.nix
View File

@ -21052,7 +21052,8 @@ let
url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz; url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz;
sha256 = "05ij0g6bfn27iaggxf8nl5rhlwx6f6p6xmdav6rjcly3x5zd1s8s"; sha256 = "05ij0g6bfn27iaggxf8nl5rhlwx6f6p6xmdav6rjcly3x5zd1s8s";
}; };
patchPhase = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' patches = [ ../development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch ];
postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
substituteInPlace Expat/Makefile.PL --replace 'use English;' '#' substituteInPlace Expat/Makefile.PL --replace 'use English;' '#'
'' + stdenv.lib.optionalString stdenv.isCygwin '' '' + stdenv.lib.optionalString stdenv.isCygwin ''
sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm