From a3ecdc0afca9188a8000919af20a65655e224fbe Mon Sep 17 00:00:00 2001 From: Laurent Pierru Date: Mon, 30 Jul 2018 16:37:37 +0200 Subject: [PATCH 1/4] fix the build on FreeBSD 10 --- common/testing/Makefile.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/common/testing/Makefile.mk b/common/testing/Makefile.mk index 3ac481b4c7..e1d11eeac5 100644 --- a/common/testing/Makefile.mk +++ b/common/testing/Makefile.mk @@ -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) common_testing_libtestmain_la_SOURCES = common/testing/GenericTester.cpp endif From c381d081aa2d0842efec2fa10f82fd1e3e92560c Mon Sep 17 00:00:00 2001 From: Laurent Pierru Date: Mon, 30 Jul 2018 21:23:29 +0200 Subject: [PATCH 2/4] fix configure on FreeBSD 11 --- config/resolv.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/resolv.m4 b/config/resolv.m4 index 8b7974f6e1..c7a67c3b78 100644 --- a/config/resolv.m4 +++ b/config/resolv.m4 @@ -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" From c6834e1261215ea6da845b773cca94c22685ca6f Mon Sep 17 00:00:00 2001 From: Laurent Pierru Date: Thu, 9 Aug 2018 00:41:07 +0200 Subject: [PATCH 3/4] Revert "fix the build on FreeBSD 10" This reverts commit a3ecdc0afca9188a8000919af20a65655e224fbe. --- common/testing/Makefile.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/common/testing/Makefile.mk b/common/testing/Makefile.mk index e1d11eeac5..3ac481b4c7 100644 --- a/common/testing/Makefile.mk +++ b/common/testing/Makefile.mk @@ -6,6 +6,5 @@ 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) common_testing_libtestmain_la_SOURCES = common/testing/GenericTester.cpp endif From e91501213db76ccaf6d9363f3643e950768d2d3d Mon Sep 17 00:00:00 2001 From: Laurent Pierru Date: Thu, 9 Aug 2018 00:41:33 +0200 Subject: [PATCH 4/4] Revert "fix configure on FreeBSD 11" This reverts commit c381d081aa2d0842efec2fa10f82fd1e3e92560c. --- config/resolv.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/resolv.m4 b/config/resolv.m4 index c7a67c3b78..8b7974f6e1 100644 --- a/config/resolv.m4 +++ b/config/resolv.m4 @@ -27,7 +27,7 @@ AC_CHECK_HEADERS([resolv.h]) am_save_LDFLAGS="$LDFLAGS" RESOLV_LIBS="" -acx_resolv_libs="-lresolv -resolv -lc" +acx_resolv_libs="-lresolv -resolv" for lib in $acx_resolv_libs; do acx_resolv_ok=no LDFLAGS="$am_save_LDFLAGS $lib"