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

Make the build logic more robust for BSD systems #108

Merged
merged 1 commit into from Jun 10, 2018
Merged

Make the build logic more robust for BSD systems #108

merged 1 commit into from Jun 10, 2018

Conversation

ararslan
Copy link
Contributor

This properly sets MAKE on BSDs to gmake rather than make, which refers to the incompatible BSD Make. Further, it betters detection of Clang as the default compiler, which is the case on FreeBSD 11.0+ and OpenBSD 6.0+, and it fixes the unrecognized call to arch on FreeBSD.

@sjaeckel
Copy link
Member

Thanks a lot!

We made sure that makefile.unix is Posix/BSD make compatible, but that's a nice addition that the original makefile and makefile.shared can now also be used on these platforms.

Btw. did you try both, makefile and makefile.shared?

Should we also port these changes to libtomcrypt?

@ararslan
Copy link
Contributor Author

(Sorry, had to fix some syntax. I was working on this between two computers yesterday and messed something up.)

We made sure that makefile.unix is Posix/BSD make compatible

I don't see a makefile.unix anywhere. Am I missing something? Even the FreeBSD port for LibTomMath uses GNU Make (and has to work around some of the issues I've addressed here).

Btw. did you try both, makefile and makefile.shared?

Yes, both gmake and gmake -f makefile.shared work as expected on FreeBSD with these changes.

Should we also port these changes to libtomcrypt?

Hm, I've not looked at libtomcrypt before, but it's quite likely that the same set of changes would be beneficial. I can submit a PR there.

@sjaeckel
Copy link
Member

(Sorry, had to fix some syntax. I was working on this between two computers yesterday and messed something up.)

No worries

I don't see a makefile.unix anywhere. Am I missing something? Even the FreeBSD port for LibTomMath uses GNU Make (and has to work around some of the issues I've addressed here).

oops, right, that port of makefile.icc to makefile.unix was only done for ltc then... sorry :)

Yes, both gmake and gmake -f makefile.shared work as expected on FreeBSD with these changes.

👍

Hm, I've not looked at libtomcrypt before, but it's quite likely that the same set of changes would be beneficial. I can submit a PR there.

Cool! That'd be great - thx!

@ararslan
Copy link
Contributor Author

PR to libtomcrypt: libtom/libtomcrypt#382

@ararslan
Copy link
Contributor Author

Figured out the escaping issues and applied here.

@sjaeckel
Copy link
Member

Can you please bring this in sync with the PR in ltc?

@ararslan
Copy link
Contributor Author

Done.

@sjaeckel
Copy link
Member

Sorry, but can you please rebase :) I'll merge afterwards!

This properly sets MAKE on BSDs to gmake rather than make, which refers
to the incompatible BSD Make. Further, it betters detection of Clang as
the default compiler, which is the case on FreeBSD 11.0+ and OpenBSD
6.0+, and it fixes the unrecognized call to arch on FreeBSD.
@ararslan
Copy link
Contributor Author

Done!

@sjaeckel sjaeckel merged commit bc685fd into libtom:develop Jun 10, 2018
@ararslan ararslan deleted the aa/freebsd branch June 10, 2018 21:37
@sjaeckel sjaeckel added this to the v1.1.0 milestone Dec 25, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants