From 4d3472389ac2453d0192fc413bd7442b425ffe63 Mon Sep 17 00:00:00 2001 From: abraunegg Date: Mon, 13 Jan 2025 16:00:53 +1100 Subject: [PATCH 1/2] Fix Alpine Docker build post FreeBSD support * Fix Alpine Docker build post FreeBSD support --- .github/workflows/docker.yaml | 6 +++--- configure.ac | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 7849cb6bb..6e2e64811 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -6,9 +6,9 @@ on: tags: [ 'v*' ] pull_request: # Comment these out to force a test build on a PR - branches: - - master - types: [closed] + #branches: + # - master + #types: [closed] env: DOCKER_HUB_SLUG: driveone/onedrive diff --git a/configure.ac b/configure.ac index e11a7dc96..5fd49d111 100644 --- a/configure.ac +++ b/configure.ac @@ -224,6 +224,21 @@ AS_IF([test "x$enable_notifications" = "xyes"], [AC_SUBST([notify_LIBS],"")]) AC_SUBST([NOTIFICATIONS],$enable_notifications) +dnl +dnl iNotify Support +AC_CANONICAL_HOST +# Conditionally set bsd_inotify_LIBS based on the platform +case "$host_os" in + freebsd*) + bsd_inotify_LIBS="-linotify" + ;; + *) + bsd_inotify_LIBS="" + ;; +esac + +AC_SUBST([bsd_inotify_LIBS]) + dnl dnl Completion support dnl First determine whether completions are requested, pass that to Makefile From 141d7f40c14b2ccf5655fc2f3472165b2741c6dc Mon Sep 17 00:00:00 2001 From: abraunegg Date: Mon, 13 Jan 2025 16:06:51 +1100 Subject: [PATCH 2/2] Update docker.yaml * Undo PR build --- .github/workflows/docker.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 6e2e64811..7849cb6bb 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -6,9 +6,9 @@ on: tags: [ 'v*' ] pull_request: # Comment these out to force a test build on a PR - #branches: - # - master - #types: [closed] + branches: + - master + types: [closed] env: DOCKER_HUB_SLUG: driveone/onedrive