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

undo efc70eb6d7c3755ca7b6e6293439463f2c80b032

Browse Source
This commit is contained in:
volth 2020-09-07 15:37:24 +00:00
parent 40fee55bae
commit 5481e02eba
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ diff --git a/Makefile.PL b/Makefile.PL
index 505d1df..fc38b76 100644 index 505d1df..fc38b76 100644
--- a/Makefile.PL --- a/Makefile.PL
+++ b/Makefile.PL +++ b/Makefile.PL
@@ -28,12 +28,18 @@ foreach (@ARGV) { @@ -29,12 +29,17 @@ foreach (@ARGV) {
@ARGV = @replacement_args; @ARGV = @replacement_args;
unless ( unless (
@ -24,22 +24,20 @@ index 505d1df..fc38b76 100644
- lib => [qw(expat)], - lib => [qw(expat)],
- header => ['expat.h'], - header => ['expat.h'],
- incpath => $expat_incpath, - incpath => $expat_incpath,
- ($expat_libpath? - ( $expat_libpath ? ( libpath => $expat_libpath ) : () ),
- (libpath => $expat_libpath):()), - )
- )) {
+ #check_lib( # fill in what you prompted the user for here + #check_lib( # fill in what you prompted the user for here
+ # lib => [qw(expat)], + # lib => [qw(expat)],
+ # header => ['expat.h'], + # header => ['expat.h'],
+ # incpath => $expat_incpath, + # incpath => $expat_incpath,
+ # ($expat_libpath? + # ( $expat_libpath ? ( libpath => $expat_libpath ) : () ),
+ # (libpath => $expat_libpath):()),
+ #) + #)
+ # The check_lib implementation fails horribly with cross-compilation. + # The check_lib implementation fails horribly with cross-compilation.
+ # We are giving known good paths to expat. + # We are giving known good paths to expat.
+ # And in all cases, the previous behaviour of not actually failing + # And in all cases, the previous behaviour of not actually failing
+ # seemed to work just fine :/. + # seemed to work just fine :/.
+ false + false
+ ) { ) {
warn <<'Expat_Not_Installed;'; warn <<'Expat_Not_Installed;';
-- --