Skip to content

Changes to allow build on FreeBSD #1460

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.

Sign up for GitHub

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

Merged
merged 9 commits into from
Aug 13, 2018
Merged

Changes to allow build on FreeBSD #1460

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0b1cdbb
fix the build on FreeBSD 10 (old one)
RenZ0 Aug 8, 2018
041f660
fix configure on FreeBSD 10.4 and 11.2
RenZ0 Aug 8, 2018
36e00ee
fix AutoStart build on FreeBSD 10.4 and 11.2
RenZ0 Aug 8, 2018
b7e3b99
Revert "fix the build on FreeBSD 10 (old one)"
RenZ0 Aug 11, 2018
ad017c3
fix tests on FreeBSD 10.4 and 11.2 (reinterpret_cast NULL not allowed)
RenZ0 Aug 11, 2018
cfb27ab
better indentation on some #ifdef __FreeBSD__
RenZ0 Aug 12, 2018
b718d97
Merge branch '0.10' into 0.10
peternewman Aug 12, 2018
58ea98a
fix indentation on all #ifdef __FreeBSD__
RenZ0 Aug 12, 2018
5421eff
Merge branch '0.10' into 0.10
peternewman Aug 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions common/testing/Makefile.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Member

@peternewman peternewman Aug 8, 2018

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.

Copy link
Contributor Author

@RenZ0 RenZ0 Aug 11, 2018

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.

Copy link
Member

@peternewman peternewman Aug 11, 2018

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.

common_testing_libtestmain_la_SOURCES = common/testing/GenericTester.cpp
endif
2 changes: 1 addition & 1 deletion config/resolv.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ AC_CHECK_HEADERS([resolv.h])
am_save_LDFLAGS="$LDFLAGS"
RESOLV_LIBS=""

acx_resolv_libs="-lresolv -resolv"
acx_resolv_libs="-lresolv -resolv -lc"
for lib in $acx_resolv_libs; do
acx_resolv_ok=no
LDFLAGS="$am_save_LDFLAGS $lib"
Expand Down
6 changes: 5 additions & 1 deletion ola/AutoStart.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
#else
reinterpret_cast<char*>(NULL));
#endif // __FreeBSD__
OLA_WARN << "Failed to exec: " << strerror(errno);
_exit(1);
}
Expand Down