summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2016-08-16 12:48:46 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2016-08-16 12:48:46 +0000
commit4421cac76d2a9151b6347d529619002160eadcb5 (patch)
treebca095fc8fc38767ffe5738dc343c263990904bb
parent77ba7d530f39ea297fe28b23bc3f01c480a352eb (diff)
downloads6-4421cac76d2a9151b6347d529619002160eadcb5.tar.xz
Apply Eric's patch for spawn support
-rw-r--r--AUTHORS1
-rw-r--r--package/deps.mak2
-rw-r--r--src/supervision/deps-exe/s6-svwait1
3 files changed, 3 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 63ae80b..311d34c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,6 +9,7 @@ Contributors:
Jean Marot <jean.marot@skarnet.org>
Olivier Brunel <jjk@jjacky.com>
Colin Booth <colin@heliocat.net>
+ Eric Le Bihan <eric.le.bihan.dev@free.fr>
Thanks to:
Dan J. Bernstein <djb@cr.yp.to>
diff --git a/package/deps.mak b/package/deps.mak
index 7f77678..216f8cf 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -242,5 +242,5 @@ s6-svscanctl: EXTRA_LIBS :=
s6-svscanctl: src/supervision/s6-svscanctl.o ${LIBS6} -lskarnet
s6-svstat: EXTRA_LIBS := ${SYSCLOCK_LIB}
s6-svstat: src/supervision/s6-svstat.o ${LIBS6} -lskarnet
-s6-svwait: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-svwait: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} ${SPAWN_LIB}
s6-svwait: src/supervision/s6-svwait.o src/supervision/s6_svlisten_loop.o ${LIBS6} -lskarnet
diff --git a/src/supervision/deps-exe/s6-svwait b/src/supervision/deps-exe/s6-svwait
index b71e12f..ab449ac 100644
--- a/src/supervision/deps-exe/s6-svwait
+++ b/src/supervision/deps-exe/s6-svwait
@@ -3,3 +3,4 @@ ${LIBS6}
-lskarnet
${SOCKET_LIB}
${TAINNOW_LIB}
+${SPAWN_LIB}