Msys2 upstream #18492
Msys2 upstream #18492
Conversation
Makefile.SH Outdated
| test_prep test-prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \ | ||
| $(dynamic_ext) $(TEST_PERL_DLL) runtests $(generated_pods) common_build | ||
| cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) | ||
| cd t && (rm -f $(PERL_EXE) $(LIBPERL); $(LNS) ../$(PERL_EXE) $(PERL_EXE); $(LNS) ../$(LIBPERL) $(LIBPERL)) |
There was a problem hiding this comment.
This change looks dubious to me. It might be correct on msys (though I'd be curious as to why) but I'm not sure we should do it for the other operating systems (that certainly do not need libperl to be in t/
| FYI porting/manifest.t is failing right now. |
Yeah, |
| @@ -0,0 +1,33 @@ | |||
| package ExtUtils::CBuilder::Platform::msys; | |||
There was a problem hiding this comment.
If this is exactly the same as ExtUtils::CBuilder::Platform::cygwin, shouldn't it just inherit from that instead?
| If the two files are exactly identical then we could do with inheritance. They should be fairly similar environments anyway. |
| Probably #18534 needs to be merged before this one. |
| | ||
| WriteMakefile( | ||
| NAME=> 'NDBM_File', | ||
| LIBS => ["-L/usr/local/lib -lndbm", "-ldbm -lucb"], |
There was a problem hiding this comment.
cygwin uses a hints/ file for this, msys should probably do exactly the same
There was a problem hiding this comment.
I suspect this entire patch isn't needed, can we double check that?
| @Corion this ticket is stalled and in conflict. Do you have any intention to rebase it to blead? It seems like people are cautiously enthusiastic about it. |
| I'll look at it - thanks for keeping up with this! |
| Rebased to current blead |
| <<$^O-eq-cygwin>> | ||
| push(@names,"cyg$_.$dl_so") unless m:/:; | ||
| <</$^O-eq-cygwin>> | ||
| <<$^O-eq-msys>> |
There was a problem hiding this comment.
This commit should also update the version to '1.55'
Corion force-pushed the msys2-upstream branch 2 times, most recently from 6cb7189 to 67d35ca Compare 
| hi! is this like merged? (as in, sometimes commits get merged using git cli in a way that gh doesn't detect it) |
No, it does not appear to have been merged. In fact, it has merge conflicts. @Corion, can you give us an update on the status of this pull request? |
# Conflicts: # ext/File-Glob/t/basic.t
# Conflicts: # ext/POSIX/t/time.t # lib/Net/hostent.t
# Conflicts: # MANIFEST
Also bump perl5db version Add ExtUtils::CBuilder::msys to MANIFEST ... at least for this proof-of-concept PR. Ideally, EU:CB:msys should go into the distribution and then get pulled back in via sync-with-cpan instead. # Conflicts: # lib/perl5db.pl
Yes, I know, this will need backporting to metaconfig
# Conflicts: # Cross/Makefile-cross-SH # Makefile.SH
| Rebased. I think the two comments by @Leont still stand, but I can't promise that I can look into them. Maybe the rest should be applied and these two left out? |
Somehow this work got spread over multiple tickets. There's some additional work here but I haven't cut it into clean patches yet. |
6 participants
This incorporates changes from https://github.com/msys2/MSYS2-packages/blob/master/perl/perl.cygwin-Win32.patch into Perl.
I've split up the PR into several commits to make reviewing easier hopefully. Also, hopefully, bisecting a problem points more closely to the problem than one large patch.
There are separate
.patchfiles forConfigurewhich I did not apply or touch (yet)