cmake: fix resolv on FreeBSD (#1152)

* ci/freebsd: use ubuntu-latest * resolv functions are provided by libc instead libresolv.so
baresip · Jul 4, 2024 · 24a78db · 24a78db
1 parent 4adf66a
commit 24a78db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     timeout-minutes: 20
 
     env:

diff --git a/cmake/re-config.cmake b/cmake/re-config.cmake
@@ -55,7 +55,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
 else()
   check_symbol_exists(res_ninit resolv.h HAVE_RESOLV)
 endif()
-if(HAVE_RESOLV)
+if(HAVE_RESOLV AND ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+  list(APPEND RE_DEFINITIONS HAVE_RESOLV)
+  set(RESOLV_LIBRARY) # Provided by libc
+elseif(HAVE_RESOLV)
   set(RESOLV_LIBRARY resolv)
   list(APPEND RE_DEFINITIONS HAVE_RESOLV)
 else()
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ on: @@
     jobs:
       build:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-latest
         timeout-minutes: 20
         env:
@@ Expand Down @@