Skip to content

Add libbsd support for non-Android builds and update CI workflows #279

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

Merged
ekanshibu merged 2 commits into from
Jan 21, 2026
Merged

Add libbsd support for non-Android builds and update CI workflows #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf2bae4
Non-Android builds lack BSD string functions
quic-vkatoch Jan 19, 2026
e3acb58
ci: update workflows with libbsd-dev dependency
quic-vkatoch Jan 19, 2026
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
3 changes: 2 additions & 1 deletion .github/workflows/abi-compat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ jobs:
automake autoconf libtool pkg-config \
gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu \
libyaml-dev \
libyaml-0-2:arm64 libyaml-dev:arm64
libyaml-0-2:arm64 libyaml-dev:arm64 \
libbsd-dev:arm64

# Sanity checks
abi-compliance-checker -version
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build_linux_arm64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ jobs:
automake autoconf libtool pkg-config \
gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu\
libyaml-dev \
libyaml-0-2:arm64 libyaml-dev:arm64
libyaml-0-2:arm64 libyaml-dev:arm64 \
libbsd-dev:arm64

- name: Sanity check libyaml (headers + ARM64 pc)
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_linux_gnu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
sudo apt-get install -y \
build-essential \
autoconf automake libtool pkg-config \
libyaml-dev \
libyaml-dev libbsd-dev \
tar gzip
- name: Compile code for LE platform
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ jobs:
automake autoconf libtool pkg-config \
gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu\
libyaml-dev \
libyaml-0-2:arm64 libyaml-dev:arm64
libyaml-0-2:arm64 libyaml-dev:arm64 \
libbsd-dev:arm64

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
8 changes: 8 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,14 @@ AS_IF([test "$compile_for_android" = no], [
AC_SUBST(YAML_LIBS)
])

# Check for libbsd only if not Android (provides strlcpy, strlcat, etc.)
AS_IF([test "$compile_for_android" = no], [
PKG_CHECK_MODULES([BSD], [libbsd-overlay], [],
[AC_MSG_ERROR([libbsd (libbsd-overlay) is required but not found.])])
AC_SUBST(BSD_CFLAGS)
AC_SUBST(BSD_LIBS)
])

# Configure config base path option (--with-config-base-dir)
AC_ARG_WITH([config-base-dir],
[AS_HELP_STRING([--with-config-base-dir=PATH],
Expand Down
12 changes: 6 additions & 6 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LIBDSPRPC_CFLAGS = -fno-short-enums -U_DEBUG -DARM_ARCH_7A -DLE_ENABLE -DENABLE_
if ANDROID_CC
LIBDSPRPC_CFLAGS += -DDEFAULT_DSP_SEARCH_PATHS='";/vendor/lib/rfsa/adsp;/vendor/dsp;"'
else
LIBDSPRPC_CFLAGS += -DPARSE_YAML @YAML_CFLAGS@ -DDEFAULT_DSP_SEARCH_PATHS='";/usr/lib/rfsa/adsp;/usr/lib/dsp;"'
LIBDSPRPC_CFLAGS += -DPARSE_YAML @YAML_CFLAGS@ @BSD_CFLAGS@ -DDEFAULT_DSP_SEARCH_PATHS='";/usr/lib/rfsa/adsp;/usr/lib/dsp;"'
endif

LIBDSPRPC_SOURCES = \
Expand Down Expand Up @@ -67,11 +67,11 @@ LIBDEFAULT_LISTENER_SOURCES = \
if ANDROID_CC
USE_LOG = -llog
else
# Add YAML libs to link flags for non-Android builds
libadsprpc_la_LIBADD = @YAML_LIBS@
libcdsprpc_la_LIBADD = @YAML_LIBS@
libsdsprpc_la_LIBADD = @YAML_LIBS@
libgdsprpc_la_LIBADD = @YAML_LIBS@
# Add YAML and BSD libs to link flags for non-Android builds
libadsprpc_la_LIBADD = @YAML_LIBS@ @BSD_LIBS@
libcdsprpc_la_LIBADD = @YAML_LIBS@ @BSD_LIBS@
libsdsprpc_la_LIBADD = @YAML_LIBS@ @BSD_LIBS@
libgdsprpc_la_LIBADD = @YAML_LIBS@ @BSD_LIBS@
endif

ADSP_CFLAGS = $(LIBDSPRPC_CFLAGS) -DDEFAULT_DOMAIN_ID=0
Expand Down
Loading