summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/codecov.yml1
-rw-r--r--.github/workflows/freebsd.yml2
-rw-r--r--.github/workflows/linux.yml5
-rw-r--r--Makefile14
4 files changed, 15 insertions, 7 deletions
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index f582892..70cbcd1 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -20,6 +20,7 @@ jobs:
libattr1-dev \
libcap2-bin \
libcap-dev \
+ libonig-dev
- name: Generate coverage
run: |
diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
index 82c0275..40ed994 100644
--- a/.github/workflows/freebsd.yml
+++ b/.github/workflows/freebsd.yml
@@ -30,4 +30,4 @@ jobs:
run: |
muon=$(tailscale ip -6 muon)
rsync -rl --delete . "[$muon]:bfs"
- ssh "$muon" 'gmake -C bfs -j$(sysctl -n hw.ncpu) distcheck'
+ ssh "$muon" 'gmake -C bfs -j$(sysctl -n hw.ncpu) distcheck EXTRA_CPPFLAGS="-I/usr/local/include" EXTRA_LDFLAGS="-L/usr/local/lib"'
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 67943f4..dbbe3b4 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -23,12 +23,15 @@ jobs:
libattr1:i386 \
libcap2-bin \
libcap-dev \
- libcap2:i386
+ libcap2:i386 \
+ libonig-dev \
+ libonig5:i386
# Ubuntu doesn't let you install the -dev packages for both amd64 and
# i386 at once, so we make our own symlinks to fix -m32 -lacl -lattr -lcap
sudo ln -s libacl.so.1 /lib/i386-linux-gnu/libacl.so
sudo ln -s libattr.so.1 /lib/i386-linux-gnu/libattr.so
sudo ln -s libcap.so.2 /lib/i386-linux-gnu/libcap.so
+ sudo ln -s libonig.so.5 /lib/i386-linux-gnu/libonig.so
- name: Run tests
run: |
diff --git a/Makefile b/Makefile
index 328b852..b73f00a 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,15 @@ ASAN := $(filter asan,$(MAKECMDGOALS))
MSAN := $(filter msan,$(MAKECMDGOALS))
UBSAN := $(filter ubsan,$(MAKECMDGOALS))
+ifndef MSAN
+WITH_ONIGURUMA := y
+endif
+
+ifdef WITH_ONIGURUMA
+LOCAL_LDLIBS += -lonig
+LOCAL_CFLAGS += -DBFS_WITH_ONIGURUMA=1
+endif
+
ifeq ($(OS),Linux)
ifndef MSAN # These libraries are not built with msan
WITH_ACL := y
@@ -101,11 +110,6 @@ else # Linux
DISTCHECK_FLAGS := TEST_FLAGS="--verbose"
endif
-ifdef WITH_ONIGURUMA
-LOCAL_LDLIBS += -lonig
-LOCAL_CFLAGS += -DBFS_WITH_ONIGURUMA=1
-endif
-
ifeq ($(OS),NetBSD)
LOCAL_LDLIBS += -lutil
endif