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

Add OpenBSD to compiler.pri and, in main.pro disable the overlay on OpenBSD. #2669

Merged
merged 2 commits into from Nov 27, 2016

Conversation

@mkrautz
Copy link
Member

commented Nov 27, 2016

This PR contains two separate commits.

  1. Handle OpenBSD like FreeBSD in compiler.pri. (/usr/local/include includepath an /usr/local/lib lib dir)
  2. Disable building the overlay on OpenBSD for now.
mkrautz added 2 commits Nov 27, 2016
compiler.pri: add OpenBSD.
Handle OpenBSD like we do FreeBSD:

1. Add /usr/local/lib to QMAKE_LIBDIR
2. Add /usr/local/include to INCLUDEPATH
3. Ensure we prefer /usr/lib over /usr/local/lib

Point 3 is mostly for FreeBSD, where we use the
base system's OpenSSL because the Qt port uses that.
This is to ensure both Mumble and Qt use the same
versions of libssl and libcrypto. If we mix-and-match,
we'll crash.
main.pro: don't build overlay on OpenBSD.
Accomplish this by automatically setting CONFIG+=no-overlay
on OpenBSD.

@mkrautz mkrautz merged commit feb2b21 into mumble-voip:master Nov 27, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant
You can’t perform that action at this time.