Skip to content

Some changes for FreeBSD #1456

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

Closed
wants to merge 5 commits into from
Closed

Some changes for FreeBSD #1456

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a3ecdc0
fix the build on FreeBSD 10
RenZ0 Jul 30, 2018
c381d08
fix configure on FreeBSD 11
RenZ0 Jul 30, 2018
7c5a15b
Merge branch 'master' into master
RenZ0 Aug 5, 2018
c6834e1
Revert "fix the build on FreeBSD 10"
RenZ0 Aug 8, 2018
e915012
Revert "fix configure on FreeBSD 11"
RenZ0 Aug 8, 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 Jul 31, 2018

Choose a reason for hiding this comment

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

What was 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?

Copy link
Contributor Author

@RenZ0 RenZ0 Aug 5, 2018

Choose a reason for hiding this comment

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

It's on a big machine and I will start it asap, say in a week or so.

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