Author: Andy Green Date: Sun Aug 09 09:45:33 2020 +0100 freebsd diff --git a/CMakeLists.txt b/CMakeLists.txt index 50e5072..19627ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,6 +73,10 @@ if (NOT SAI_LWS_INC_PATH) message(FATAL_ERROR "Can't find lws headers") endif() endif() + +list(APPEND CMAKE_REQUIRED_INCLUDES ${SAI_LWS_INC_PATH}) +message("Required incs: ${CMAKE_REQUIRED_INCLUDES}") + if (NOT SAI_LWS_LIB_PATH) find_library(XSAI_LWS_LIB_PATH NAMES "websockets") set(SAI_LWS_LIB_PATH ${XSAI_LWS_LIB_PATH}) @@ -82,7 +86,7 @@ if (NOT SAI_LWS_LIB_PATH) endif() if (SAI_EXT_PTHREAD_INCLUDE_DIR) - set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES};${SAI_EXT_PTHREAD_INCLUDE_DIR}) + list(APPEND CMAKE_REQUIRED_INCLUDES ${SAI_EXT_PTHREAD_INCLUDE_DIR}) include_directories(${SAI_EXT_PTHREAD_INCLUDE_DIR}) set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} " -DHAVE_STRUCT_TIMESPEC=1") @@ -172,7 +176,7 @@ MACRO(require_lws_config reqconfig _val result) endif() ENDMACRO() -set(CMAKE_REQUIRED_INCLUDES ${SAI_LWS_INC_PATH}) +#set(CMAKE_REQUIRED_INCLUDES ${SAI_LWS_INC_PATH}) set(requirements 1) require_lws_config(LWS_ROLE_H1 1 requirements) diff --git a/README.md b/README.md index bc8bdfd..34a8519 100644 --- a/README.md +++ b/README.md @@ -298,7 +298,7 @@ master|libsqlite3 builder|libgit2 pthreads jig|libgpiod -#### Linux +#### Unix / Linux ``` $ git clone https://warmcat.com/repo/sai @@ -309,3 +309,17 @@ $ sudo cp ../scripts/builder-conf /etc/sai/builder/conf $ sudo vim /etc/sai/builder/conf $ sudo systemctl enable sai-builder ``` + +#### Additional steps for freebsd + +Freebsd doesn't present many difference from Linux. Create the sai user via +`adduser` and set the uid to 883. Create the builder logproxy socket dir +one time as root + +``` +# mkdir -p /var/run/com.warmcat.com.saib.logproxy +# chown sai /var/run/com.warmcat.com.saib.logproxy +``` + +There's no systemctl, + diff --git a/assets/freebsd-12.svg b/assets/freebsd-12.svg new file mode 100644 index 0000000..fba9b89 --- /dev/null +++ b/assets/freebsd-12.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt index fd2391e..c800fa4 100644 --- a/src/device/CMakeLists.txt +++ b/src/device/CMakeLists.txt @@ -20,6 +20,10 @@ if (requirements) set_property(TARGET sai-device PROPERTY MACOSX_RPATH YES) endif() + if (SAI_LWS_INC_PATH) + target_include_directories("sai-device" PRIVATE ${SAI_LWS_INC_PATH}) + endif() + target_link_libraries("sai-device" ${SAI_LWS_LIB_PATH}) if (LWS_OPENSSL_LIBRARIES) diff --git a/src/expect/CMakeLists.txt b/src/expect/CMakeLists.txt index 4c146f8..31af912 100644 --- a/src/expect/CMakeLists.txt +++ b/src/expect/CMakeLists.txt @@ -26,6 +26,9 @@ if (requirements AND NOT MSVC) if (APPLE) set_property(TARGET sai-expect PROPERTY MACOSX_RPATH YES) endif() + if (SAI_LWS_INC_PATH) + target_include_directories("sai-expect" PRIVATE ${SAI_LWS_INC_PATH}) + endif() target_link_libraries("sai-expect" ${SAI_LWS_LIB_PATH})