-
Notifications
You must be signed in to change notification settings - Fork 205
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
Changes to allow build on FreeBSD #1460
Conversation
Based on #1456 . The first commit is for FreeBSD 10 (old one). |
common/testing/Makefile.mk
Outdated
@@ -6,5 +6,6 @@ noinst_LTLIBRARIES += common/testing/libolatesting.la \ | |||
common_testing_libolatesting_la_SOURCES = \ | |||
common/testing/MockUDPSocket.cpp \ | |||
common/testing/TestUtils.cpp | |||
common_testing_libolatesting_la_CXXFLAGS = $(COMMON_TESTING_PROTOBUF_FLAGS) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need @RenZ0 to check the exact message you were getting for this please and I'll see if we can use a more bespoke and appropriate set of flags? This will be in some time when he can restart the machine again.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is on FreeBSD 10.0-RELEASE. I can't reproduce that, I guess I had the message because I started from the release and I didn't run autoreconf. So this change is not needed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, yeah great, lets revert this change then.
Also blocked by upstream https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=230282 . |
The upstream bug has now been merged! |
Tests are now fixed as well. |
ola/AutoStart.cpp
Outdated
@@ -110,7 +110,11 @@ TCPSocket *ConnectToServer(unsigned short port) { | |||
// Try to start the server, we pass --daemon (fork into background) and | |||
// --syslog (log to syslog). | |||
execlp("olad", "olad", "--daemon", "--syslog", | |||
reinterpret_cast<char*>(NULL)); | |||
#ifdef __FreeBSD__ | |||
reinterpret_cast<char*>(0)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we align this, and the line below with the ( above please.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done, with some more occurences :)
Indentation should be proper now. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. So this now builds correctly on FreeBSD 10.0/10.4 and 11 (aside from the ThreadTester failure)?
It's probably worth updating NEWS with this fact too.
@@ -226,7 +226,7 @@ vector<Interface> PosixInterfacePicker::GetInterfaces( | |||
interface.index = ifrcopy.ifr_index; | |||
#else | |||
interface.index = ifrcopy.ifr_ifindex; | |||
#endif // SIOCGIFINDEX | |||
#endif // __FreeBSD__ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good spot!
Blocked behind #1464 |
Also we may precise in NEWS that 10.0 needs --disable-fatal-warnings, because of error: unused parameter 'e' [-Werror,-Wunused-parameter], which seems to be an upstream cppunit header error. |
You could do @RenZ0 , but given it's unsupported it's probably not worth it. |
Same issue on musl 1.2.3 as well. Why not just make it 0 everywhere? |
Followed up in #1773 . |
No description provided.