From 6367d4549ba3a69526b49062193e9825cf04fad9 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 16 Aug 2016 12:49:12 +0000 Subject: Apply Eric's patch for spawn support --- AUTHORS | 3 +++ package/deps.mak | 2 +- src/s6-rc/deps-exe/s6-rc-init | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 357692d..2b8b9d1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,9 @@ Main author: Laurent Bercot +Contributors: + Eric Le Bihan + Thanks to: Avery Payne Olivier Brunel 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} -- cgit v1.2.3