summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2016-08-16 12:49:12 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2016-08-16 12:49:12 +0000
commit6367d4549ba3a69526b49062193e9825cf04fad9 (patch)
tree6f995e7e0672073b6eb32bdf299f2d4b12615408
parent137a5f7975c452cbe1b607dbd1ffdf5727d61f30 (diff)
downloads6-rc-6367d4549ba3a69526b49062193e9825cf04fad9.tar.xz
Apply Eric's patch for spawn support
-rw-r--r--AUTHORS3
-rw-r--r--package/deps.mak2
-rw-r--r--src/s6-rc/deps-exe/s6-rc-init1
3 files changed, 5 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 357692d..2b8b9d1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,9 @@
Main author:
Laurent Bercot <ska-skaware@skarnet.org>
+Contributors:
+ Eric Le Bihan <eric.le.bihan.dev@free.fr>
+
Thanks to:
Avery Payne <avery.p.payne@gmail.com>
Olivier Brunel <jjk@jjacky.com>
diff --git a/package/deps.mak b/package/deps.mak
index 3e3938a..054d439 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -46,7 +46,7 @@ s6-rc-dryrun: EXTRA_LIBS := ${TAINNOW_LIB}
s6-rc-dryrun: src/s6-rc/s6-rc-dryrun.o -lskarnet
s6-rc-fdholder-filler: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB}
s6-rc-fdholder-filler: src/s6-rc/s6-rc-fdholder-filler.o -ls6 -lskarnet
-s6-rc-init: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB}
+s6-rc-init: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB} ${SPAWN_LIB}
s6-rc-init: src/s6-rc/s6-rc-init.o ${LIBS6RC} -ls6 -lskarnet
s6-rc-oneshot-run: EXTRA_LIBS :=
s6-rc-oneshot-run: src/s6-rc/s6-rc-oneshot-run.o ${LIBS6RC} -lskarnet
diff --git a/src/s6-rc/deps-exe/s6-rc-init b/src/s6-rc/deps-exe/s6-rc-init
index b5622f9..5fb6d66 100644
--- a/src/s6-rc/deps-exe/s6-rc-init
+++ b/src/s6-rc/deps-exe/s6-rc-init
@@ -3,3 +3,4 @@ ${LIBS6RC}
-lskarnet
${TAINNOW_LIB}
${SOCKET_LIB}
+${SPAWN_LIB}