Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use gmake for FreeBSD #815

Merged
merged 2 commits into from
Oct 26, 2020
Merged

Conversation

matsduf
Copy link
Contributor

@matsduf matsduf commented Oct 21, 2020

  • Updated Makefile.PL so that gmake is used for share/Makefile
  • Updated installation instruction to include devel/gmake
  • Updated MANIFEST to include yet another file under "inc"

* Updated Makefile.PL so that gmake is used for share/Makefile
* Updated installation instruction to include devel/gmake
* Updated MANIFEST to include yet another file under "inc"
@matsduf matsduf added P-High Priority: Issue to be solved before other A-BuildSystem labels Oct 21, 2020
@matsduf matsduf added this to the v2020.1 milestone Oct 21, 2020
@matsduf matsduf requested review from mattias-p, sandoche2k and a user October 21, 2020 17:16
@matsduf
Copy link
Contributor Author

matsduf commented Oct 21, 2020

Please test this on Linux too.

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is the inc/Module/Install/External.pm from ? I doesn't seem to be present when building on Ubuntu.

@@ -9,6 +9,7 @@ docs/Translation-translators.md
inc/Module/Install.pm
inc/Module/Install/Base.pm
inc/Module/Install/Can.pm
inc/Module/Install/External.pm
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is not present on Ubuntu :

$ make distcheck
"/usr/bin/perl" "-Iinc" "-MExtUtils::Manifest=fullcheck" -e fullcheck
No such file: inc/Module/Install/External.pm

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suspected that. It appeared when building on FreeBSD after adding

if ($^O eq "freebsd") {
    requires_external_bin 'gmake';
};

to Makefile.PL. I will investigate.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now inc/Module/Install/External.pm is included by the second commit. Please review again.

Copy link
Member

@mattias-p mattias-p left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't tested it but it makes sense to me in principle.

@matsduf
Copy link
Contributor Author

matsduf commented Oct 23, 2020

@PNAX, can you test again?

@ghost ghost requested review from a user and mattias-p October 26, 2020 10:04
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works on Ubuntu.

@mattias-p sorry I misclicked for the review (and I don't know how to reset it)

@matsduf matsduf merged commit d6aca8e into zonemaster:develop Oct 26, 2020
@matsduf matsduf deleted the use-gmake-for-freebsd branch October 26, 2020 10:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
P-High Priority: Issue to be solved before other
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants