commit 162fcfac5bb4d2cd40f7adc1d2d9ae71d6c86b19
parent 4da6b9c320e6b49d38af5cb6b5861480141f24cd
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 12 Oct 2015 14:01:11 +0000
Push back GNU make dependency to 3.81
Diffstat:
5 files changed, 65 insertions(+), 66 deletions(-)
diff --git a/INSTALL b/INSTALL
@@ -5,7 +5,7 @@ Build Instructions
------------
- A POSIX-compliant C development environment
- - GNU make version 4.0 or later
+ - GNU make version 3.81 or later
- skalibs version 2.3.7.1 or later: http://skarnet.org/software/skalibs/
- execline version 2.1.4.1 or later: http://skarnet.org/software/execline/
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@
it: all
-make_need := 4.0
+make_need := 3.81
ifeq "" "$(strip $(filter $(make_need), $(firstword $(sort $(make_need) $(MAKE_VERSION)))))"
fail := $(error Your make ($(MAKE_VERSION)) is too old. You need $(make_need) or newer)
endif
@@ -20,7 +20,7 @@ INTERNAL_LIBS :=
EXTRA_TARGETS :=
LIB_DEFS :=
-define library_definition =
+define library_definition
LIB$(firstword $(subst =, ,$(1))) := lib$(lastword $(subst =, ,$(1))).$(if $(DO_ALLSTATIC),a,so).xyzzy
ifdef DO_SHARED
SHARED_LIBS += lib$(lastword $(subst =, ,$(1))).so.xyzzy
diff --git a/doc/index.html b/doc/index.html
@@ -81,8 +81,7 @@ with s6</a> </li>
<ul>
<li> A POSIX-compliant system with a standard C development environment </li>
- <li> GNU make, version 4.0 or later. Please be aware that s6 will not build
-with an earlier version. </li>
+ <li> GNU make, version 3.81 or later </li>
<li> <a href="http://skarnet.org/software/skalibs/">skalibs</a> version
2.3.7.1 or later. It's a build-time requirement. It's also a run-time
requirement if you link against the shared version of the skalibs
diff --git a/package/deps.mak b/package/deps.mak
@@ -125,122 +125,122 @@ src/supervision/s6-svwait.o src/supervision/s6-svwait.lo: src/supervision/s6-svw
src/supervision/s6_svlisten_loop.o src/supervision/s6_svlisten_loop.lo: src/supervision/s6_svlisten_loop.c src/supervision/s6-svlisten.h src/include/s6/ftrigr.h src/include/s6/s6-supervise.h
src/supervision/s6_svlisten_signal_handler.o src/supervision/s6_svlisten_signal_handler.lo: src/supervision/s6_svlisten_signal_handler.c src/supervision/s6-svlisten.h
-s6-accessrules-cdb-from-fs: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-accessrules-cdb-from-fs: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-accessrules-cdb-from-fs: src/conn-tools/s6-accessrules-cdb-from-fs.o -lskarnet
-s6-accessrules-fs-from-cdb: private EXTRA_LIBS :=
+s6-accessrules-fs-from-cdb: EXTRA_LIBS :=
s6-accessrules-fs-from-cdb: src/conn-tools/s6-accessrules-fs-from-cdb.o -lskarnet
-s6-connlimit: private EXTRA_LIBS :=
+s6-connlimit: EXTRA_LIBS :=
s6-connlimit: src/conn-tools/s6-connlimit.o -lskarnet
-s6-ioconnect: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-ioconnect: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-ioconnect: src/conn-tools/s6-ioconnect.o -lskarnet
-s6-ipcclient: private EXTRA_LIBS := ${SOCKET_LIB}
+s6-ipcclient: EXTRA_LIBS := ${SOCKET_LIB}
s6-ipcclient: src/conn-tools/s6-ipcclient.o -lskarnet
-s6-ipcserver: private EXTRA_LIBS :=
+s6-ipcserver: EXTRA_LIBS :=
s6-ipcserver: src/conn-tools/s6-ipcserver.o -lskarnet
-s6-ipcserver-access: private EXTRA_LIBS := ${SOCKET_LIB}
+s6-ipcserver-access: EXTRA_LIBS := ${SOCKET_LIB}
s6-ipcserver-access: src/conn-tools/s6-ipcserver-access.o ${LIBS6} -lskarnet
-s6-ipcserver-socketbinder: private EXTRA_LIBS := ${SOCKET_LIB}
+s6-ipcserver-socketbinder: EXTRA_LIBS := ${SOCKET_LIB}
s6-ipcserver-socketbinder: src/conn-tools/s6-ipcserver-socketbinder.o -lskarnet
-s6-ipcserverd: private EXTRA_LIBS := ${SOCKET_LIB}
+s6-ipcserverd: EXTRA_LIBS := ${SOCKET_LIB}
s6-ipcserverd: src/conn-tools/s6-ipcserverd.o -lskarnet
-s6-sudo: private EXTRA_LIBS :=
+s6-sudo: EXTRA_LIBS :=
s6-sudo: src/conn-tools/s6-sudo.o -lskarnet
-s6-sudoc: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-sudoc: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-sudoc: src/conn-tools/s6-sudoc.o -lskarnet
-s6-sudod: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-sudod: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-sudod: src/conn-tools/s6-sudod.o -lskarnet
-s6-applyuidgid: private EXTRA_LIBS :=
+s6-applyuidgid: EXTRA_LIBS :=
s6-applyuidgid: src/daemontools-extras/s6-applyuidgid.o -lskarnet
-s6-envdir: private EXTRA_LIBS :=
+s6-envdir: EXTRA_LIBS :=
s6-envdir: src/daemontools-extras/s6-envdir.o -lskarnet
-s6-envuidgid: private EXTRA_LIBS :=
+s6-envuidgid: EXTRA_LIBS :=
s6-envuidgid: src/daemontools-extras/s6-envuidgid.o -lskarnet
-s6-fghack: private EXTRA_LIBS :=
+s6-fghack: EXTRA_LIBS :=
s6-fghack: src/daemontools-extras/s6-fghack.o -lskarnet
-s6-log: private EXTRA_LIBS := ${TAINNOW_LIB}
+s6-log: EXTRA_LIBS := ${TAINNOW_LIB}
s6-log: src/daemontools-extras/s6-log.o -lskarnet
-s6-setlock: private EXTRA_LIBS := ${TAINNOW_LIB}
+s6-setlock: EXTRA_LIBS := ${TAINNOW_LIB}
s6-setlock: src/daemontools-extras/s6-setlock.o -lskarnet
-s6-setsid: private EXTRA_LIBS :=
+s6-setsid: EXTRA_LIBS :=
s6-setsid: src/daemontools-extras/s6-setsid.o -lskarnet
-s6-setuidgid: private EXTRA_LIBS :=
+s6-setuidgid: EXTRA_LIBS :=
s6-setuidgid: src/daemontools-extras/s6-setuidgid.o -lskarnet
-s6-softlimit: private EXTRA_LIBS :=
+s6-softlimit: EXTRA_LIBS :=
s6-softlimit: src/daemontools-extras/s6-softlimit.o -lskarnet
-s6-tai64n: private EXTRA_LIBS := ${SYSCLOCK_LIB}
+s6-tai64n: EXTRA_LIBS := ${SYSCLOCK_LIB}
s6-tai64n: src/daemontools-extras/s6-tai64n.o -lskarnet
-s6-tai64nlocal: private EXTRA_LIBS :=
+s6-tai64nlocal: EXTRA_LIBS :=
s6-tai64nlocal: src/daemontools-extras/s6-tai64nlocal.o -lskarnet
-ucspilogd: private EXTRA_LIBS :=
+ucspilogd: EXTRA_LIBS :=
ucspilogd: src/daemontools-extras/ucspilogd.o -lskarnet
-s6-fdholder-daemon: private EXTRA_LIBS :=
+s6-fdholder-daemon: EXTRA_LIBS :=
s6-fdholder-daemon: src/fdholder/s6-fdholder-daemon.o -lskarnet
-s6-fdholder-delete: private EXTRA_LIBS :=
+s6-fdholder-delete: EXTRA_LIBS :=
s6-fdholder-delete: src/fdholder/s6-fdholder-delete.o -lskarnet
-s6-fdholder-deletec: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-fdholder-deletec: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-fdholder-deletec: src/fdholder/s6-fdholder-deletec.o ${LIBS6} -lskarnet
-s6-fdholder-getdump: private EXTRA_LIBS :=
+s6-fdholder-getdump: EXTRA_LIBS :=
s6-fdholder-getdump: src/fdholder/s6-fdholder-getdump.o -lskarnet
-s6-fdholder-getdumpc: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-fdholder-getdumpc: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-fdholder-getdumpc: src/fdholder/s6-fdholder-getdumpc.o ${LIBS6} -lskarnet
-s6-fdholder-list: private EXTRA_LIBS :=
+s6-fdholder-list: EXTRA_LIBS :=
s6-fdholder-list: src/fdholder/s6-fdholder-list.o -lskarnet
-s6-fdholder-listc: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-fdholder-listc: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-fdholder-listc: src/fdholder/s6-fdholder-listc.o ${LIBS6} -lskarnet
-s6-fdholder-retrieve: private EXTRA_LIBS :=
+s6-fdholder-retrieve: EXTRA_LIBS :=
s6-fdholder-retrieve: src/fdholder/s6-fdholder-retrieve.o -lskarnet
-s6-fdholder-retrievec: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-fdholder-retrievec: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-fdholder-retrievec: src/fdholder/s6-fdholder-retrievec.o ${LIBS6} -lskarnet
-s6-fdholder-setdump: private EXTRA_LIBS :=
+s6-fdholder-setdump: EXTRA_LIBS :=
s6-fdholder-setdump: src/fdholder/s6-fdholder-setdump.o -lskarnet
-s6-fdholder-setdumpc: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-fdholder-setdumpc: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-fdholder-setdumpc: src/fdholder/s6-fdholder-setdumpc.o ${LIBS6} -lskarnet
-s6-fdholder-store: private EXTRA_LIBS :=
+s6-fdholder-store: EXTRA_LIBS :=
s6-fdholder-store: src/fdholder/s6-fdholder-store.o -lskarnet
-s6-fdholder-storec: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-fdholder-storec: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-fdholder-storec: src/fdholder/s6-fdholder-storec.o ${LIBS6} -lskarnet
-s6-fdholder-transferdump: private EXTRA_LIBS :=
+s6-fdholder-transferdump: EXTRA_LIBS :=
s6-fdholder-transferdump: src/fdholder/s6-fdholder-transferdump.o -lskarnet
-s6-fdholder-transferdumpc: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-fdholder-transferdumpc: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-fdholder-transferdumpc: src/fdholder/s6-fdholder-transferdumpc.o ${LIBS6} -lskarnet
-s6-fdholderd: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-fdholderd: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-fdholderd: src/fdholder/s6-fdholderd.o ${LIBS6} -lskarnet
libs6.a.xyzzy: src/libs6/ftrigr1_zero.o src/libs6/ftrigr_check.o src/libs6/ftrigr_end.o src/libs6/ftrigr_start.o src/libs6/ftrigr_startf.o src/libs6/ftrigr_subscribe.o src/libs6/ftrigr_unsubscribe.o src/libs6/ftrigr_update.o src/libs6/ftrigr_wait_and.o src/libs6/ftrigr_wait_or.o src/libs6/ftrigr_zero.o src/libs6/ftrigw_clean.o src/libs6/ftrigw_fifodir_make.o src/libs6/ftrigw_notify.o src/libs6/ftrigw_notifyb.o src/libs6/ftrigw_notifyb_nosig.o src/libs6/s6_accessrules_backend_cdb.o src/libs6/s6_accessrules_backend_fs.o src/libs6/s6_accessrules_keycheck_ip4.o src/libs6/s6_accessrules_keycheck_ip6.o src/libs6/s6_accessrules_keycheck_reversedns.o src/libs6/s6_accessrules_keycheck_uidgid.o src/libs6/s6_accessrules_params_free.o src/libs6/s6_accessrules_uidgid_cdb.o src/libs6/s6_accessrules_uidgid_fs.o src/libs6/s6_supervise_lock.o src/libs6/s6_supervise_lock_mode.o src/libs6/s6_svc_ok.o src/libs6/s6_svc_write.o src/libs6/s6_svc_writectl.o src/libs6/s6_svstatus_pack.o src/libs6/s6_svstatus_read.o src/libs6/s6_svstatus_unpack.o src/libs6/s6_svstatus_write.o src/libs6/s6lock_acquire.o src/libs6/s6lock_check.o src/libs6/s6lock_end.o src/libs6/s6lock_release.o src/libs6/s6lock_start.o src/libs6/s6lock_startf.o src/libs6/s6lock_update.o src/libs6/s6lock_wait_and.o src/libs6/s6lock_wait_or.o src/libs6/s6lock_zero.o src/libs6/s6_fdholder_delete.o src/libs6/s6_fdholder_delete_async.o src/libs6/s6_fdholder_getdump.o src/libs6/s6_fdholder_list.o src/libs6/s6_fdholder_list_async.o src/libs6/s6_fdholder_list_cb.o src/libs6/s6_fdholder_retrieve.o src/libs6/s6_fdholder_retrieve_async.o src/libs6/s6_fdholder_retrieve_cb.o src/libs6/s6_fdholder_setdump.o src/libs6/s6_fdholder_store.o src/libs6/s6_fdholder_store_async.o
-libs6.so.xyzzy: private EXTRA_LIBS := -lskarnet
+libs6.so.xyzzy: EXTRA_LIBS := -lskarnet
libs6.so.xyzzy: src/libs6/ftrigr1_zero.lo src/libs6/ftrigr_check.lo src/libs6/ftrigr_end.lo src/libs6/ftrigr_start.lo src/libs6/ftrigr_startf.lo src/libs6/ftrigr_subscribe.lo src/libs6/ftrigr_unsubscribe.lo src/libs6/ftrigr_update.lo src/libs6/ftrigr_wait_and.lo src/libs6/ftrigr_wait_or.lo src/libs6/ftrigr_zero.lo src/libs6/ftrigw_clean.lo src/libs6/ftrigw_fifodir_make.lo src/libs6/ftrigw_notify.lo src/libs6/ftrigw_notifyb.lo src/libs6/ftrigw_notifyb_nosig.lo src/libs6/s6_accessrules_backend_cdb.lo src/libs6/s6_accessrules_backend_fs.lo src/libs6/s6_accessrules_keycheck_ip4.lo src/libs6/s6_accessrules_keycheck_ip6.lo src/libs6/s6_accessrules_keycheck_reversedns.lo src/libs6/s6_accessrules_keycheck_uidgid.lo src/libs6/s6_accessrules_params_free.lo src/libs6/s6_accessrules_uidgid_cdb.lo src/libs6/s6_accessrules_uidgid_fs.lo src/libs6/s6_supervise_lock.lo src/libs6/s6_supervise_lock_mode.lo src/libs6/s6_svc_ok.lo src/libs6/s6_svc_write.lo src/libs6/s6_svc_writectl.lo src/libs6/s6_svstatus_pack.lo src/libs6/s6_svstatus_read.lo src/libs6/s6_svstatus_unpack.lo src/libs6/s6_svstatus_write.lo src/libs6/s6lock_acquire.lo src/libs6/s6lock_check.lo src/libs6/s6lock_end.lo src/libs6/s6lock_release.lo src/libs6/s6lock_start.lo src/libs6/s6lock_startf.lo src/libs6/s6lock_update.lo src/libs6/s6lock_wait_and.lo src/libs6/s6lock_wait_or.lo src/libs6/s6lock_zero.lo src/libs6/s6_fdholder_delete.lo src/libs6/s6_fdholder_delete_async.lo src/libs6/s6_fdholder_getdump.lo src/libs6/s6_fdholder_list.lo src/libs6/s6_fdholder_list_async.lo src/libs6/s6_fdholder_list_cb.lo src/libs6/s6_fdholder_retrieve.lo src/libs6/s6_fdholder_retrieve_async.lo src/libs6/s6_fdholder_retrieve_cb.lo src/libs6/s6_fdholder_setdump.lo src/libs6/s6_fdholder_store.lo src/libs6/s6_fdholder_store_async.lo
-s6-ftrigrd: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-ftrigrd: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-ftrigrd: src/libs6/s6-ftrigrd.o src/libs6/ftrig1_free.o src/libs6/ftrig1_make.o -lskarnet
-s6lockd: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6lockd: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6lockd: src/libs6/s6lockd.o -lskarnet
-s6lockd-helper: private EXTRA_LIBS :=
+s6lockd-helper: EXTRA_LIBS :=
s6lockd-helper: src/libs6/s6lockd-helper.o -lskarnet
-s6-cleanfifodir: private EXTRA_LIBS :=
+s6-cleanfifodir: EXTRA_LIBS :=
s6-cleanfifodir: src/pipe-tools/s6-cleanfifodir.o ${LIBS6} -lskarnet
-s6-ftrig-listen: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-ftrig-listen: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-ftrig-listen: src/pipe-tools/s6-ftrig-listen.o ${LIBS6} -lexecline -lskarnet
-s6-ftrig-listen1: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-ftrig-listen1: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-ftrig-listen1: src/pipe-tools/s6-ftrig-listen1.o ${LIBS6} -lskarnet
-s6-ftrig-notify: private EXTRA_LIBS :=
+s6-ftrig-notify: EXTRA_LIBS :=
s6-ftrig-notify: src/pipe-tools/s6-ftrig-notify.o ${LIBS6} -lskarnet
-s6-ftrig-wait: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-ftrig-wait: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-ftrig-wait: src/pipe-tools/s6-ftrig-wait.o ${LIBS6} -lskarnet
-s6-mkfifodir: private EXTRA_LIBS :=
+s6-mkfifodir: EXTRA_LIBS :=
s6-mkfifodir: src/pipe-tools/s6-mkfifodir.o ${LIBS6} -lskarnet
-s6-supervise: private EXTRA_LIBS := ${TAINNOW_LIB}
+s6-supervise: EXTRA_LIBS := ${TAINNOW_LIB}
s6-supervise: src/supervision/s6-supervise.o ${LIBS6} -lskarnet
-s6-svc: private EXTRA_LIBS :=
+s6-svc: EXTRA_LIBS :=
s6-svc: src/supervision/s6-svc.o ${LIBS6} -lskarnet
-s6-svlisten: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-svlisten: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-svlisten: src/supervision/s6-svlisten.o src/supervision/s6_svlisten_signal_handler.o src/supervision/s6_svlisten_loop.o ${LIBS6} -lexecline -lskarnet
-s6-svlisten1: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-svlisten1: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-svlisten1: src/supervision/s6-svlisten1.o src/supervision/s6_svlisten_signal_handler.o src/supervision/s6_svlisten_loop.o ${LIBS6} -lskarnet
-s6-svok: private EXTRA_LIBS :=
+s6-svok: EXTRA_LIBS :=
s6-svok: src/supervision/s6-svok.o ${LIBS6} -lskarnet
-s6-svscan: private EXTRA_LIBS := ${TAINNOW_LIB}
+s6-svscan: EXTRA_LIBS := ${TAINNOW_LIB}
s6-svscan: src/supervision/s6-svscan.o ${LIBS6} -lskarnet
-s6-svscanctl: private EXTRA_LIBS :=
+s6-svscanctl: EXTRA_LIBS :=
s6-svscanctl: src/supervision/s6-svscanctl.o ${LIBS6} -lskarnet
-s6-svstat: private EXTRA_LIBS := ${SYSCLOCK_LIB}
+s6-svstat: EXTRA_LIBS := ${SYSCLOCK_LIB}
s6-svstat: src/supervision/s6-svstat.o ${LIBS6} -lskarnet
-s6-svwait: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-svwait: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-svwait: src/supervision/s6-svwait.o src/supervision/s6_svlisten_loop.o ${LIBS6} -lskarnet
diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh
@@ -66,7 +66,7 @@ for dir in $(ls -1 src | grep -v ^include) ; do
fi
done < src/$dir/deps-lib/$file
echo "lib${file}.a.xyzzy:$deps"
- echo "lib${file}.so.xyzzy: private EXTRA_LIBS :=$libs"
+ echo "lib${file}.so.xyzzy: EXTRA_LIBS :=$libs"
echo "lib${file}.so.xyzzy:$(echo "$deps" | sed 's/\.o/.lo/g')"
done
@@ -83,7 +83,7 @@ for dir in $(ls -1 src | grep -v ^include) ; do
deps="$deps $dep"
fi
done < src/$dir/deps-exe/$file
- echo "$file: private EXTRA_LIBS :=$libs"
+ echo "$file: EXTRA_LIBS :=$libs"
echo "$file: src/$dir/$file.o$deps"
done
done
