Skip to content
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.

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

bsdutils/meson.build: find musl-fts on systems that require it #385

Merged
merged 12 commits into from Feb 23, 2023
4 changes: 4 additions & 0 deletions .github/workflows/c-cpp.yml
Expand Up @@ -61,6 +61,10 @@ jobs:
- name: ubuntu-22.04-without-curses
os: ubuntu-22.04
setup: -Dwithout-curses=true
- name: Alpine
os: ubuntu-22.04
container: andy5995/rmw-build-env:alpine
setup: -Db_sanitize=none
- name: macos-latest-brew-canfigger
os: macos-latest
install_packages: canfigger
Expand Down
5 changes: 5 additions & 0 deletions ChangeLog
@@ -1,5 +1,10 @@
=== rmw ChangeLog ===

2023-02-23

* fix build on Alpine Linux (check for and link to musl-fts)
Thanks to @eli-schwartz and Hello71 from #musl on Libera IRC.

2023-02-15

* change message displayed to user when a file being rmw'ed is on a
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Expand Up @@ -2,7 +2,7 @@ FROM andy5995/rmw-build-env:alpine

RUN git clone --depth 1 https://github.com/theimpossibleastronaut/rmw
WORKDIR /rmw
RUN LDFLAGS=-lfts meson setup builddir --buildtype=release -Db_sanitize=none --prefix=/usr
RUN meson setup builddir --buildtype=release -Db_sanitize=none --prefix=/usr
WORKDIR /rmw/builddir
RUN ninja -v && meson test -v
RUN DESTDIR=/tmp/rmw ninja install
Expand Down
6 changes: 6 additions & 0 deletions src/bsdutils/meson.build
@@ -1,4 +1,10 @@
dep_fts = dependency('', required: false)
if not cc.has_function('fts_open', prefix: '#include <fts.h>')
dep_fts = cc.find_library('fts')
endif

lib_bsdutilsrm = static_library(
'bsdutilsrm',
['rm.c', 'strmode.c'],
dependencies: [dep_fts]
)