Someday I'll figure out dynamic libraries dependencies with rpath

13 files changed, 16 insertions, 25 deletions

diff --git a/package/deps.mak b/package/deps.mak
index 29cf4a2..b1dbbf1 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -106,33 +106,33 @@ libs6rcrepo.a.xyzzy: src/repo/s6rc_repo_badpipeline.o src/repo/s6rc_repo_badrx.o
 else
 libs6rcrepo.a.xyzzy:src/repo/s6rc_repo_badpipeline.lo src/repo/s6rc_repo_badrx.lo src/repo/s6rc_repo_checkset.lo src/repo/s6rc_repo_cleanup.lo src/repo/s6rc_repo_compile.lo src/repo/s6rc_repo_fillset.lo src/repo/s6rc_repo_fixset.lo src/repo/s6rc_repo_flattenservices.lo src/repo/s6rc_repo_getserviceflags.lo src/repo/s6rc_repo_list_sets.lo src/repo/s6rc_repo_listalldeps.lo src/repo/s6rc_repo_listcontents.lo src/repo/s6rc_repo_listdeps.lo src/repo/s6rc_repo_listdeps_internal.lo src/repo/s6rc_repo_listrx.lo src/repo/s6rc_repo_lock.lo src/repo/s6rc_repo_ls.lo src/repo/s6rc_repo_makedefbundle.lo src/repo/s6rc_repo_makesetbundles.lo src/repo/s6rc_repo_makestores.lo src/repo/s6rc_repo_makesvlist.lo src/repo/s6rc_repo_makesvlist_byname.lo src/repo/s6rc_repo_moveservices.lo src/repo/s6rc_repo_removeinternals.lo src/repo/s6rc_repo_rxnames.lo src/repo/s6rc_repo_sanitize_setname.lo src/repo/s6rc_repo_sanitize_svname.lo src/repo/s6rc_repo_setcompile.lo src/repo/s6rc_repo_setcopy.lo src/repo/s6rc_repo_setdelete.lo src/repo/s6rc_repo_setuptodate.lo src/repo/s6rc_repo_sv_bcmpr.lo src/repo/s6rc_repo_sv_cmpr.lo src/repo/s6rc_repo_sync.lo src/repo/s6rc_repo_syncset.lo src/repo/s6rc_repo_syncset_tmp.lo src/repo/s6rc_repo_touch.lo src/repo/s6rc_repo_touchset.lo src/repo/s6rc_repo_type_check.lo
 endif
-libs6rcrepo.pc: EXTRA_LIBS := -lskarnet ${SPAWN_LIB}
-libs6rcrepo.so.xyzzy: EXTRA_LIBS := -lskarnet ${SPAWN_LIB}
+libs6rcrepo.pc: EXTRA_LIBS := -ls6rc -ls6 -lskarnet ${SPAWN_LIB}
+libs6rcrepo.so.xyzzy: EXTRA_LIBS := -ls6rc -ls6 -lskarnet ${SPAWN_LIB}
 libs6rcrepo.so.xyzzy:src/repo/s6rc_repo_badpipeline.lo src/repo/s6rc_repo_badrx.lo src/repo/s6rc_repo_checkset.lo src/repo/s6rc_repo_cleanup.lo src/repo/s6rc_repo_compile.lo src/repo/s6rc_repo_fillset.lo src/repo/s6rc_repo_fixset.lo src/repo/s6rc_repo_flattenservices.lo src/repo/s6rc_repo_getserviceflags.lo src/repo/s6rc_repo_list_sets.lo src/repo/s6rc_repo_listalldeps.lo src/repo/s6rc_repo_listcontents.lo src/repo/s6rc_repo_listdeps.lo src/repo/s6rc_repo_listdeps_internal.lo src/repo/s6rc_repo_listrx.lo src/repo/s6rc_repo_lock.lo src/repo/s6rc_repo_ls.lo src/repo/s6rc_repo_makedefbundle.lo src/repo/s6rc_repo_makesetbundles.lo src/repo/s6rc_repo_makestores.lo src/repo/s6rc_repo_makesvlist.lo src/repo/s6rc_repo_makesvlist_byname.lo src/repo/s6rc_repo_moveservices.lo src/repo/s6rc_repo_removeinternals.lo src/repo/s6rc_repo_rxnames.lo src/repo/s6rc_repo_sanitize_setname.lo src/repo/s6rc_repo_sanitize_svname.lo src/repo/s6rc_repo_setcompile.lo src/repo/s6rc_repo_setcopy.lo src/repo/s6rc_repo_setdelete.lo src/repo/s6rc_repo_setuptodate.lo src/repo/s6rc_repo_sv_bcmpr.lo src/repo/s6rc_repo_sv_cmpr.lo src/repo/s6rc_repo_sync.lo src/repo/s6rc_repo_syncset.lo src/repo/s6rc_repo_syncset_tmp.lo src/repo/s6rc_repo_touch.lo src/repo/s6rc_repo_touchset.lo src/repo/s6rc_repo_type_check.lo
-libs6rcrepo.dylib.xyzzy: EXTRA_LIBS := -lskarnet ${SPAWN_LIB}
+libs6rcrepo.dylib.xyzzy: EXTRA_LIBS := -ls6rc -ls6 -lskarnet ${SPAWN_LIB}
 libs6rcrepo.dylib.xyzzy:src/repo/s6rc_repo_badpipeline.lo src/repo/s6rc_repo_badrx.lo src/repo/s6rc_repo_checkset.lo src/repo/s6rc_repo_cleanup.lo src/repo/s6rc_repo_compile.lo src/repo/s6rc_repo_fillset.lo src/repo/s6rc_repo_fixset.lo src/repo/s6rc_repo_flattenservices.lo src/repo/s6rc_repo_getserviceflags.lo src/repo/s6rc_repo_list_sets.lo src/repo/s6rc_repo_listalldeps.lo src/repo/s6rc_repo_listcontents.lo src/repo/s6rc_repo_listdeps.lo src/repo/s6rc_repo_listdeps_internal.lo src/repo/s6rc_repo_listrx.lo src/repo/s6rc_repo_lock.lo src/repo/s6rc_repo_ls.lo src/repo/s6rc_repo_makedefbundle.lo src/repo/s6rc_repo_makesetbundles.lo src/repo/s6rc_repo_makestores.lo src/repo/s6rc_repo_makesvlist.lo src/repo/s6rc_repo_makesvlist_byname.lo src/repo/s6rc_repo_moveservices.lo src/repo/s6rc_repo_removeinternals.lo src/repo/s6rc_repo_rxnames.lo src/repo/s6rc_repo_sanitize_setname.lo src/repo/s6rc_repo_sanitize_svname.lo src/repo/s6rc_repo_setcompile.lo src/repo/s6rc_repo_setcopy.lo src/repo/s6rc_repo_setdelete.lo src/repo/s6rc_repo_setuptodate.lo src/repo/s6rc_repo_sv_bcmpr.lo src/repo/s6rc_repo_sv_cmpr.lo src/repo/s6rc_repo_sync.lo src/repo/s6rc_repo_syncset.lo src/repo/s6rc_repo_syncset_tmp.lo src/repo/s6rc_repo_touch.lo src/repo/s6rc_repo_touchset.lo src/repo/s6rc_repo_type_check.lo
 s6-rc-repo-init: EXTRA_LIBS := ${SPAWN_LIB}
-s6-rc-repo-init: src/repo/s6-rc-repo-init.o ${LIBS6RCREPO} ${LIBS6RC} -lskarnet
+s6-rc-repo-init: src/repo/s6-rc-repo-init.o ${LIBS6RCREPO} -lskarnet
 s6-rc-repo-list: EXTRA_LIBS := ${SPAWN_LIB}
-s6-rc-repo-list: src/repo/s6-rc-repo-list.o ${LIBS6RCREPO} ${LIBS6RC} -lskarnet
+s6-rc-repo-list: src/repo/s6-rc-repo-list.o ${LIBS6RCREPO} -lskarnet
 s6-rc-repo-sync: EXTRA_LIBS := ${SPAWN_LIB}
-s6-rc-repo-sync: src/repo/s6-rc-repo-sync.o ${LIBS6RCREPO} ${LIBS6RC} -lskarnet
+s6-rc-repo-sync: src/repo/s6-rc-repo-sync.o ${LIBS6RCREPO} -lskarnet
 s6-rc-set-change: EXTRA_LIBS := ${SPAWN_LIB}
-s6-rc-set-change: src/repo/s6-rc-set-change.o ${LIBS6RCREPO} ${LIBS6RC} -lskarnet
+s6-rc-set-change: src/repo/s6-rc-set-change.o ${LIBS6RCREPO} -lskarnet
 s6-rc-set-commit: EXTRA_LIBS := ${SPAWN_LIB}
-s6-rc-set-commit: src/repo/s6-rc-set-commit.o ${LIBS6RCREPO} ${LIBS6RC} -lskarnet
+s6-rc-set-commit: src/repo/s6-rc-set-commit.o ${LIBS6RCREPO} -lskarnet
 s6-rc-set-copy: EXTRA_LIBS := ${SPAWN_LIB}
-s6-rc-set-copy: src/repo/s6-rc-set-copy.o ${LIBS6RCREPO} ${LIBS6RC} -lskarnet
+s6-rc-set-copy: src/repo/s6-rc-set-copy.o ${LIBS6RCREPO} -lskarnet
 s6-rc-set-delete: EXTRA_LIBS := ${SPAWN_LIB}
-s6-rc-set-delete: src/repo/s6-rc-set-delete.o ${LIBS6RCREPO} ${LIBS6RC} -lskarnet
+s6-rc-set-delete: src/repo/s6-rc-set-delete.o ${LIBS6RCREPO} -lskarnet
 s6-rc-set-fix: EXTRA_LIBS := ${SPAWN_LIB}
-s6-rc-set-fix: src/repo/s6-rc-set-fix.o ${LIBS6RCREPO} ${LIBS6RC} -lskarnet
+s6-rc-set-fix: src/repo/s6-rc-set-fix.o ${LIBS6RCREPO} -lskarnet
 s6-rc-set-install: EXTRA_LIBS := ${SPAWN_LIB}
-s6-rc-set-install: src/repo/s6-rc-set-install.o ${LIBS6RCREPO} ${LIBS6RC} -lskarnet
+s6-rc-set-install: src/repo/s6-rc-set-install.o ${LIBS6RCREPO} -lskarnet
 s6-rc-set-new: EXTRA_LIBS := ${SPAWN_LIB}
-s6-rc-set-new: src/repo/s6-rc-set-new.o ${LIBS6RCREPO} ${LIBS6RC} -lskarnet
+s6-rc-set-new: src/repo/s6-rc-set-new.o ${LIBS6RCREPO} -lskarnet
 s6-rc-set-status: EXTRA_LIBS := ${SPAWN_LIB}
-s6-rc-set-status: src/repo/s6-rc-set-status.o ${LIBS6RCREPO} ${LIBS6RC} -lskarnet
+s6-rc-set-status: src/repo/s6-rc-set-status.o ${LIBS6RCREPO} -lskarnet
 s6-rc: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SPAWN_LIB}
 s6-rc: src/s6-rc/s6-rc.o ${LIBS6RC} -ls6 -lskarnet
 s6-rc-bundle: EXTRA_LIBS :=
diff --git a/src/repo/deps-exe/s6-rc-repo-init b/src/repo/deps-exe/s6-rc-repo-init
index 3214aaa..9fe69bb 100644
--- a/src/repo/deps-exe/s6-rc-repo-init
+++ b/src/repo/deps-exe/s6-rc-repo-init
@@ -1,4 +1,3 @@
 ${LIBS6RCREPO}
-${LIBS6RC}
 -lskarnet
 ${SPAWN_LIB}
diff --git a/src/repo/deps-exe/s6-rc-repo-list b/src/repo/deps-exe/s6-rc-repo-list
index 3214aaa..9fe69bb 100644
--- a/src/repo/deps-exe/s6-rc-repo-list
+++ b/src/repo/deps-exe/s6-rc-repo-list
@@ -1,4 +1,3 @@
 ${LIBS6RCREPO}
-${LIBS6RC}
 -lskarnet
 ${SPAWN_LIB}
diff --git a/src/repo/deps-exe/s6-rc-repo-sync b/src/repo/deps-exe/s6-rc-repo-sync
index 3214aaa..9fe69bb 100644
--- a/src/repo/deps-exe/s6-rc-repo-sync
+++ b/src/repo/deps-exe/s6-rc-repo-sync
@@ -1,4 +1,3 @@
 ${LIBS6RCREPO}
-${LIBS6RC}
 -lskarnet
 ${SPAWN_LIB}
diff --git a/src/repo/deps-exe/s6-rc-set-change b/src/repo/deps-exe/s6-rc-set-change
index 3214aaa..9fe69bb 100644
--- a/src/repo/deps-exe/s6-rc-set-change
+++ b/src/repo/deps-exe/s6-rc-set-change
@@ -1,4 +1,3 @@
 ${LIBS6RCREPO}
-${LIBS6RC}
 -lskarnet
 ${SPAWN_LIB}
diff --git a/src/repo/deps-exe/s6-rc-set-commit b/src/repo/deps-exe/s6-rc-set-commit
index 3214aaa..9fe69bb 100644
--- a/src/repo/deps-exe/s6-rc-set-commit
+++ b/src/repo/deps-exe/s6-rc-set-commit
@@ -1,4 +1,3 @@
 ${LIBS6RCREPO}
-${LIBS6RC}
 -lskarnet
 ${SPAWN_LIB}
diff --git a/src/repo/deps-exe/s6-rc-set-copy b/src/repo/deps-exe/s6-rc-set-copy
index 3214aaa..9fe69bb 100644
--- a/src/repo/deps-exe/s6-rc-set-copy
+++ b/src/repo/deps-exe/s6-rc-set-copy
@@ -1,4 +1,3 @@
 ${LIBS6RCREPO}
-${LIBS6RC}
 -lskarnet
 ${SPAWN_LIB}
diff --git a/src/repo/deps-exe/s6-rc-set-delete b/src/repo/deps-exe/s6-rc-set-delete
index 3214aaa..9fe69bb 100644
--- a/src/repo/deps-exe/s6-rc-set-delete
+++ b/src/repo/deps-exe/s6-rc-set-delete
@@ -1,4 +1,3 @@
 ${LIBS6RCREPO}
-${LIBS6RC}
 -lskarnet
 ${SPAWN_LIB}
diff --git a/src/repo/deps-exe/s6-rc-set-fix b/src/repo/deps-exe/s6-rc-set-fix
index 3214aaa..9fe69bb 100644
--- a/src/repo/deps-exe/s6-rc-set-fix
+++ b/src/repo/deps-exe/s6-rc-set-fix
@@ -1,4 +1,3 @@
 ${LIBS6RCREPO}
-${LIBS6RC}
 -lskarnet
 ${SPAWN_LIB}
diff --git a/src/repo/deps-exe/s6-rc-set-install b/src/repo/deps-exe/s6-rc-set-install
index 3214aaa..9fe69bb 100644
--- a/src/repo/deps-exe/s6-rc-set-install
+++ b/src/repo/deps-exe/s6-rc-set-install
@@ -1,4 +1,3 @@
 ${LIBS6RCREPO}
-${LIBS6RC}
 -lskarnet
 ${SPAWN_LIB}
diff --git a/src/repo/deps-exe/s6-rc-set-new b/src/repo/deps-exe/s6-rc-set-new
index 3214aaa..9fe69bb 100644
--- a/src/repo/deps-exe/s6-rc-set-new
+++ b/src/repo/deps-exe/s6-rc-set-new
@@ -1,4 +1,3 @@
 ${LIBS6RCREPO}
-${LIBS6RC}
 -lskarnet
 ${SPAWN_LIB}
diff --git a/src/repo/deps-exe/s6-rc-set-status b/src/repo/deps-exe/s6-rc-set-status
index 3214aaa..9fe69bb 100644
--- a/src/repo/deps-exe/s6-rc-set-status
+++ b/src/repo/deps-exe/s6-rc-set-status
@@ -1,4 +1,3 @@
 ${LIBS6RCREPO}
-${LIBS6RC}
 -lskarnet
 ${SPAWN_LIB}
diff --git a/src/repo/deps-lib/s6rcrepo b/src/repo/deps-lib/s6rcrepo
index 1935001..1f1cfa1 100644
--- a/src/repo/deps-lib/s6rcrepo
+++ b/src/repo/deps-lib/s6rcrepo
@@ -37,5 +37,7 @@ s6rc_repo_syncset_tmp.o
 s6rc_repo_touch.o
 s6rc_repo_touchset.o
 s6rc_repo_type_check.o
+-ls6rc
+-ls6
 -lskarnet
 ${SPAWN_LIB}