diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2024-07-16 22:15:50 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2024-07-16 22:15:50 +0000 |
| commit | 1777259f308db7c48ac3ad24cd410007881e6fc8 (patch) | |
| tree | 1b889b744bf783da277950fc72ef4e060cddfe31 | |
| parent | 91b376e92ab5210a7ddfe7d1567552cc0a6de7f8 (diff) | |
| download | s6-1777259f308db7c48ac3ad24cd410007881e6fc8.tar.xz | |
Fix Solaris 10 build
Signed-off-by: Laurent Bercot <ska@appnovation.com>
| -rw-r--r-- | package/deps.mak | 6 | ||||
| -rw-r--r-- | src/conn-tools/deps-exe/s6-ipcserverd | 1 | ||||
| -rw-r--r-- | src/daemontools-extras/lolsyslog.c | 7 | ||||
| -rw-r--r-- | src/instance/deps-exe/s6-instance-create | 1 | ||||
| -rw-r--r-- | src/instance/deps-exe/s6-instance-delete | 1 |
5 files changed, 11 insertions, 5 deletions
diff --git a/package/deps.mak b/package/deps.mak index 1a154c6..1dd783c 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -160,7 +160,7 @@ s6-ipcserver-access: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} s6-ipcserver-access: src/conn-tools/s6-ipcserver-access.o ${LIBS6} s6-ipcserver-socketbinder: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} s6-ipcserver-socketbinder: src/conn-tools/s6-ipcserver-socketbinder.o -s6-ipcserverd: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SPAWN_LIB} +s6-ipcserverd: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB} s6-ipcserverd: src/conn-tools/s6-ipcserverd.o s6-sudo: EXTRA_LIBS := -lskarnet s6-sudo: src/conn-tools/s6-sudo.o @@ -214,9 +214,9 @@ s6-fdholderd: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} s6-fdholderd: src/fdholder/s6-fdholderd.o ${LIBS6} s6-instance-control: EXTRA_LIBS := -lskarnet s6-instance-control: src/instance/s6-instance-control.o -s6-instance-create: EXTRA_LIBS := -lskarnet +s6-instance-create: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB} s6-instance-create: src/instance/s6-instance-create.o ${LIBS6} -s6-instance-delete: EXTRA_LIBS := -lskarnet +s6-instance-delete: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB} s6-instance-delete: src/instance/s6-instance-delete.o ${LIBS6} s6-instance-list: EXTRA_LIBS := -lskarnet s6-instance-list: src/instance/s6-instance-list.o ${LIBS6} diff --git a/src/conn-tools/deps-exe/s6-ipcserverd b/src/conn-tools/deps-exe/s6-ipcserverd index fad0b6f..50e2fd6 100644 --- a/src/conn-tools/deps-exe/s6-ipcserverd +++ b/src/conn-tools/deps-exe/s6-ipcserverd @@ -1,3 +1,4 @@ -lskarnet ${SOCKET_LIB} +${SYSCLOCK_LIB} ${SPAWN_LIB} diff --git a/src/daemontools-extras/lolsyslog.c b/src/daemontools-extras/lolsyslog.c index e62bdef..0ade2f3 100644 --- a/src/daemontools-extras/lolsyslog.c +++ b/src/daemontools-extras/lolsyslog.c @@ -75,17 +75,20 @@ size_t lolsyslog_string (char *out, char const *in) unsigned int fpr ; int fp ; CODE const *p = facilitynames ; + char const *x ; if (in[0] != '<' || !(i = uint_scan(in+1, &fpr)) || in[1+i] != '>') return 0 ; fp = LOG_FAC(fpr) << 3 ; for (; p->c_name ; p++) if (p->c_val == fp) break ; - out = stpcpy(out, p->c_name ? p->c_name : "unknown") ; + x = p->c_name ? p->c_name : "unknown" ; + strcpy(out, x) ; out += strlen(x) ; *out++ = '.' ; p = prioritynames ; fp = LOG_PRI(fpr) ; for (; p->c_name ; p++) if (p->c_val == fp) break ; - out = stpcpy(out, p->c_name ? p->c_name : "unknown") ; + x = p->c_name ? p->c_name : "unknown" ; + strcpy(out, x) ; out += strlen(x) ; *out++ = ':' ; *out++ = ' ' ; *out++ = 0 ; return i+2 ; } diff --git a/src/instance/deps-exe/s6-instance-create b/src/instance/deps-exe/s6-instance-create index 08815d9..b1e57e4 100644 --- a/src/instance/deps-exe/s6-instance-create +++ b/src/instance/deps-exe/s6-instance-create @@ -1,2 +1,3 @@ ${LIBS6} -lskarnet +${SYSCLOCK_LIB} diff --git a/src/instance/deps-exe/s6-instance-delete b/src/instance/deps-exe/s6-instance-delete index 08815d9..b1e57e4 100644 --- a/src/instance/deps-exe/s6-instance-delete +++ b/src/instance/deps-exe/s6-instance-delete @@ -1,2 +1,3 @@ ${LIBS6} -lskarnet +${SYSCLOCK_LIB} |