From 8f29b68cc95714b41d281ff0355e2074e1ca6bc4 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 18 Mar 2025 04:38:39 +0000
Subject:  It's a vpath problem... so work around it, temporarily >.>

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 package/deps.mak                        | 8 ++++----
 src/s6-rc/deps-exe/s6-rc-bundle         | 1 +
 src/s6-rc/deps-exe/s6-rc-compile        | 1 +
 src/s6-rc/deps-exe/s6-rc-db             | 1 +
 src/s6-rc/deps-exe/s6-rc-format-upgrade | 1 +
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/package/deps.mak b/package/deps.mak
index 7e1f0d1..ea15313 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -45,17 +45,17 @@ libs6rc.so.xyzzy: EXTRA_LIBS := -ls6 -lskarnet
 libs6rc.so.xyzzy: src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_livedir_canon.lo src/libs6rc/s6rc_livedir_create.lo src/libs6rc/s6rc_livedir_prefix.lo src/libs6rc/s6rc_livedir_prefixsize.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo src/libs6rc/s6rc_servicedir_unsupervise.lo
 s6-rc: EXTRA_LIBS := -ls6 -lskarnet ${SYSCLOCK_LIB} ${SPAWN_LIB}
 s6-rc: src/s6-rc/s6-rc.o ${LIBS6RC}
-s6-rc-bundle: EXTRA_LIBS := -lexecline -lskarnet
+s6-rc-bundle: EXTRA_LIBS := -ls6 -lexecline -lskarnet
 s6-rc-bundle: src/s6-rc/s6-rc-bundle.o ${LIBS6RC}
-s6-rc-compile: EXTRA_LIBS := -lexecline -lskarnet
+s6-rc-compile: EXTRA_LIBS := -ls6 -lexecline -lskarnet
 s6-rc-compile: src/s6-rc/s6-rc-compile.o ${LIBS6RC}
-s6-rc-db: EXTRA_LIBS := -lskarnet
+s6-rc-db: EXTRA_LIBS := -ls6 -lskarnet
 s6-rc-db: src/s6-rc/s6-rc-db.o ${LIBS6RC}
 s6-rc-dryrun: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB}
 s6-rc-dryrun: src/s6-rc/s6-rc-dryrun.o
 s6-rc-fdholder-filler: EXTRA_LIBS := -ls6 -lskarnet ${SYSCLOCK_LIB} ${SOCKET_LIB}
 s6-rc-fdholder-filler: src/s6-rc/s6-rc-fdholder-filler.o
-s6-rc-format-upgrade: EXTRA_LIBS := -lskarnet
+s6-rc-format-upgrade: EXTRA_LIBS := -ls6 -lskarnet
 s6-rc-format-upgrade: src/s6-rc/s6-rc-format-upgrade.o ${LIBS6RC}
 s6-rc-init: EXTRA_LIBS := -ls6 -lskarnet ${SYSCLOCK_LIB} ${SOCKET_LIB} ${SPAWN_LIB}
 s6-rc-init: src/s6-rc/s6-rc-init.o ${LIBS6RC}
diff --git a/src/s6-rc/deps-exe/s6-rc-bundle b/src/s6-rc/deps-exe/s6-rc-bundle
index 9dbd823..1dd24c2 100644
--- a/src/s6-rc/deps-exe/s6-rc-bundle
+++ b/src/s6-rc/deps-exe/s6-rc-bundle
@@ -1,3 +1,4 @@
 ${LIBS6RC}
+-ls6
 -lexecline
 -lskarnet
diff --git a/src/s6-rc/deps-exe/s6-rc-compile b/src/s6-rc/deps-exe/s6-rc-compile
index 9dbd823..1dd24c2 100644
--- a/src/s6-rc/deps-exe/s6-rc-compile
+++ b/src/s6-rc/deps-exe/s6-rc-compile
@@ -1,3 +1,4 @@
 ${LIBS6RC}
+-ls6
 -lexecline
 -lskarnet
diff --git a/src/s6-rc/deps-exe/s6-rc-db b/src/s6-rc/deps-exe/s6-rc-db
index 152b051..fa594f2 100644
--- a/src/s6-rc/deps-exe/s6-rc-db
+++ b/src/s6-rc/deps-exe/s6-rc-db
@@ -1,2 +1,3 @@
 ${LIBS6RC}
+-ls6
 -lskarnet
diff --git a/src/s6-rc/deps-exe/s6-rc-format-upgrade b/src/s6-rc/deps-exe/s6-rc-format-upgrade
index 152b051..fa594f2 100644
--- a/src/s6-rc/deps-exe/s6-rc-format-upgrade
+++ b/src/s6-rc/deps-exe/s6-rc-format-upgrade
@@ -1,2 +1,3 @@
 ${LIBS6RC}
+-ls6
 -lskarnet
-- 
cgit v1.3.1