aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/configure-snippets/configure_case_lines2
-rw-r--r--package/configure-snippets/configure_expand_dirs1
-rw-r--r--package/configure-snippets/configure_extra_checks1
-rw-r--r--package/configure-snippets/configure_generate_configh1
-rw-r--r--package/configure-snippets/configure_generate_make5
-rw-r--r--package/configure-snippets/configure_help_dependencies1
-rw-r--r--package/configure-snippets/configure_help_install1
-rw-r--r--package/configure-snippets/configure_help_options2
-rw-r--r--package/configure-snippets/configure_init_vars1
-rw-r--r--package/configure-snippets/configure_slashpackage_other1
-rw-r--r--package/deps-build2
-rw-r--r--package/deps.mak164
-rw-r--r--package/info2
13 files changed, 100 insertions, 84 deletions
diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines
new file mode 100644
index 0000000..2fd412d
--- /dev/null
+++ b/package/configure-snippets/configure_case_lines
@@ -0,0 +1,2 @@
+ --enable-multicall|--enable-multicall=yes) multicall=true ;;
+ --disable-multicall|--enable-multicall=no) multicall=false ;;
diff --git a/package/configure-snippets/configure_expand_dirs b/package/configure-snippets/configure_expand_dirs
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_expand_dirs
@@ -0,0 +1 @@
+
diff --git a/package/configure-snippets/configure_extra_checks b/package/configure-snippets/configure_extra_checks
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_extra_checks
@@ -0,0 +1 @@
+
diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_generate_configh
@@ -0,0 +1 @@
+
diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make
new file mode 100644
index 0000000..751d1f4
--- /dev/null
+++ b/package/configure-snippets/configure_generate_make
@@ -0,0 +1,5 @@
+if $multicall ; then
+ echo "MULTICALL := 1"
+else
+ echo "MULTICALL :="
+fi
diff --git a/package/configure-snippets/configure_help_dependencies b/package/configure-snippets/configure_help_dependencies
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_help_dependencies
@@ -0,0 +1 @@
+
diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_help_install
@@ -0,0 +1 @@
+
diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options
new file mode 100644
index 0000000..f124942
--- /dev/null
+++ b/package/configure-snippets/configure_help_options
@@ -0,0 +1,2 @@
+ --enable-multicall build a multicall binary [disabled]
+
diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars
new file mode 100644
index 0000000..ac7b1d7
--- /dev/null
+++ b/package/configure-snippets/configure_init_vars
@@ -0,0 +1 @@
+multicall=false
diff --git a/package/configure-snippets/configure_slashpackage_other b/package/configure-snippets/configure_slashpackage_other
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_slashpackage_other
@@ -0,0 +1 @@
+
diff --git a/package/deps-build b/package/deps-build
index 05d5af4..1a04c17 100644
--- a/package/deps-build
+++ b/package/deps-build
@@ -1 +1 @@
-/package/prog/skalibs
+true true /package/prog/skalibs 2.14.4.0 libskarnet
diff --git a/package/deps.mak b/package/deps.mak
index 8afd59b..6a13594 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -46,92 +46,92 @@ src/s6-portable-utils/s6-unquote.o src/s6-portable-utils/s6-unquote.lo: src/s6-p
src/s6-portable-utils/s6-update-symlinks.o src/s6-portable-utils/s6-update-symlinks.lo: src/s6-portable-utils/s6-update-symlinks.c
src/s6-portable-utils/seekablepipe.o src/s6-portable-utils/seekablepipe.lo: src/s6-portable-utils/seekablepipe.c
-s6-portable-utils: EXTRA_LIBS := -lskarnet ${SPAWN_LIB}
-s6-portable-utils: src/multicall/s6-portable-utils.o
-s6-basename: EXTRA_LIBS := -lskarnet
-s6-basename: src/s6-portable-utils/s6-basename.o
-s6-cat: EXTRA_LIBS := -lskarnet
-s6-cat: src/s6-portable-utils/s6-cat.o
-s6-chmod: EXTRA_LIBS := -lskarnet
-s6-chmod: src/s6-portable-utils/s6-chmod.o
-s6-chown: EXTRA_LIBS := -lskarnet
-s6-chown: src/s6-portable-utils/s6-chown.o
-s6-clock: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB}
-s6-clock: src/s6-portable-utils/s6-clock.o
-s6-cut: EXTRA_LIBS := -lskarnet
-s6-cut: src/s6-portable-utils/s6-cut.o
-s6-dirname: EXTRA_LIBS := -lskarnet
-s6-dirname: src/s6-portable-utils/s6-dirname.o
-s6-dumpenv: EXTRA_LIBS := -lskarnet
-s6-dumpenv: src/s6-portable-utils/s6-dumpenv.o
-s6-echo: EXTRA_LIBS := -lskarnet
-s6-echo: src/s6-portable-utils/s6-echo.o
-s6-env: EXTRA_LIBS := -lskarnet
-s6-env: src/s6-portable-utils/s6-env.o
-s6-expr: EXTRA_LIBS := -lskarnet
-s6-expr: src/s6-portable-utils/s6-expr.o
+s6-portable-utils: EXTRA_LIBS := ${SPAWN_LIB}
+s6-portable-utils: src/multicall/s6-portable-utils.o -lskarnet
+s6-basename: EXTRA_LIBS :=
+s6-basename: src/s6-portable-utils/s6-basename.o -lskarnet
+s6-cat: EXTRA_LIBS :=
+s6-cat: src/s6-portable-utils/s6-cat.o -lskarnet
+s6-chmod: EXTRA_LIBS :=
+s6-chmod: src/s6-portable-utils/s6-chmod.o -lskarnet
+s6-chown: EXTRA_LIBS :=
+s6-chown: src/s6-portable-utils/s6-chown.o -lskarnet
+s6-clock: EXTRA_LIBS := ${SYSCLOCK_LIB}
+s6-clock: src/s6-portable-utils/s6-clock.o -lskarnet
+s6-cut: EXTRA_LIBS :=
+s6-cut: src/s6-portable-utils/s6-cut.o -lskarnet
+s6-dirname: EXTRA_LIBS :=
+s6-dirname: src/s6-portable-utils/s6-dirname.o -lskarnet
+s6-dumpenv: EXTRA_LIBS :=
+s6-dumpenv: src/s6-portable-utils/s6-dumpenv.o -lskarnet
+s6-echo: EXTRA_LIBS :=
+s6-echo: src/s6-portable-utils/s6-echo.o -lskarnet
+s6-env: EXTRA_LIBS :=
+s6-env: src/s6-portable-utils/s6-env.o -lskarnet
+s6-expr: EXTRA_LIBS :=
+s6-expr: src/s6-portable-utils/s6-expr.o -lskarnet
s6-false: EXTRA_LIBS :=
s6-false: src/s6-portable-utils/s6-false.o
-s6-format-filter: EXTRA_LIBS := -lskarnet
-s6-format-filter: src/s6-portable-utils/s6-format-filter.o
-s6-grep: EXTRA_LIBS := -lskarnet
-s6-grep: src/s6-portable-utils/s6-grep.o
-s6-head: EXTRA_LIBS := -lskarnet
-s6-head: src/s6-portable-utils/s6-head.o
-s6-hiercopy: EXTRA_LIBS := -lskarnet
-s6-hiercopy: src/s6-portable-utils/s6-hiercopy.o
-s6-linkname: EXTRA_LIBS := -lskarnet
-s6-linkname: src/s6-portable-utils/s6-linkname.o
-s6-ln: EXTRA_LIBS := -lskarnet
-s6-ln: src/s6-portable-utils/s6-ln.o
-s6-ls: EXTRA_LIBS := -lskarnet
-s6-ls: src/s6-portable-utils/s6-ls.o
-s6-maximumtime: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB} ${SPAWN_LIB}
-s6-maximumtime: src/s6-portable-utils/s6-maximumtime.o
-s6-mkdir: EXTRA_LIBS := -lskarnet
-s6-mkdir: src/s6-portable-utils/s6-mkdir.o
-s6-mkfifo: EXTRA_LIBS := -lskarnet
-s6-mkfifo: src/s6-portable-utils/s6-mkfifo.o
-s6-nice: EXTRA_LIBS := -lskarnet
-s6-nice: src/s6-portable-utils/s6-nice.o
-s6-nuke: EXTRA_LIBS := -lskarnet
-s6-nuke: src/s6-portable-utils/s6-nuke.o
-s6-pause: EXTRA_LIBS := -lskarnet
-s6-pause: src/s6-portable-utils/s6-pause.o
-s6-printenv: EXTRA_LIBS := -lskarnet
-s6-printenv: src/s6-portable-utils/s6-printenv.o
-s6-quote: EXTRA_LIBS := -lskarnet
-s6-quote: src/s6-portable-utils/s6-quote.o
-s6-quote-filter: EXTRA_LIBS := -lskarnet
-s6-quote-filter: src/s6-portable-utils/s6-quote-filter.o
-s6-rename: EXTRA_LIBS := -lskarnet
-s6-rename: src/s6-portable-utils/s6-rename.o
-s6-rmrf: EXTRA_LIBS := -lskarnet
-s6-rmrf: src/s6-portable-utils/s6-rmrf.o
-s6-seq: EXTRA_LIBS := -lskarnet
-s6-seq: src/s6-portable-utils/s6-seq.o
-s6-sleep: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB}
-s6-sleep: src/s6-portable-utils/s6-sleep.o
-s6-sort: EXTRA_LIBS := -lskarnet
-s6-sort: src/s6-portable-utils/s6-sort.o
+s6-format-filter: EXTRA_LIBS :=
+s6-format-filter: src/s6-portable-utils/s6-format-filter.o -lskarnet
+s6-grep: EXTRA_LIBS :=
+s6-grep: src/s6-portable-utils/s6-grep.o -lskarnet
+s6-head: EXTRA_LIBS :=
+s6-head: src/s6-portable-utils/s6-head.o -lskarnet
+s6-hiercopy: EXTRA_LIBS :=
+s6-hiercopy: src/s6-portable-utils/s6-hiercopy.o -lskarnet
+s6-linkname: EXTRA_LIBS :=
+s6-linkname: src/s6-portable-utils/s6-linkname.o -lskarnet
+s6-ln: EXTRA_LIBS :=
+s6-ln: src/s6-portable-utils/s6-ln.o -lskarnet
+s6-ls: EXTRA_LIBS :=
+s6-ls: src/s6-portable-utils/s6-ls.o -lskarnet
+s6-maximumtime: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SPAWN_LIB}
+s6-maximumtime: src/s6-portable-utils/s6-maximumtime.o -lskarnet
+s6-mkdir: EXTRA_LIBS :=
+s6-mkdir: src/s6-portable-utils/s6-mkdir.o -lskarnet
+s6-mkfifo: EXTRA_LIBS :=
+s6-mkfifo: src/s6-portable-utils/s6-mkfifo.o -lskarnet
+s6-nice: EXTRA_LIBS :=
+s6-nice: src/s6-portable-utils/s6-nice.o -lskarnet
+s6-nuke: EXTRA_LIBS :=
+s6-nuke: src/s6-portable-utils/s6-nuke.o -lskarnet
+s6-pause: EXTRA_LIBS :=
+s6-pause: src/s6-portable-utils/s6-pause.o -lskarnet
+s6-printenv: EXTRA_LIBS :=
+s6-printenv: src/s6-portable-utils/s6-printenv.o -lskarnet
+s6-quote: EXTRA_LIBS :=
+s6-quote: src/s6-portable-utils/s6-quote.o -lskarnet
+s6-quote-filter: EXTRA_LIBS :=
+s6-quote-filter: src/s6-portable-utils/s6-quote-filter.o -lskarnet
+s6-rename: EXTRA_LIBS :=
+s6-rename: src/s6-portable-utils/s6-rename.o -lskarnet
+s6-rmrf: EXTRA_LIBS :=
+s6-rmrf: src/s6-portable-utils/s6-rmrf.o -lskarnet
+s6-seq: EXTRA_LIBS :=
+s6-seq: src/s6-portable-utils/s6-seq.o -lskarnet
+s6-sleep: EXTRA_LIBS := ${SYSCLOCK_LIB}
+s6-sleep: src/s6-portable-utils/s6-sleep.o -lskarnet
+s6-sort: EXTRA_LIBS :=
+s6-sort: src/s6-portable-utils/s6-sort.o -lskarnet
s6-sync: EXTRA_LIBS :=
s6-sync: src/s6-portable-utils/s6-sync.o
-s6-tai64ndiff: EXTRA_LIBS := -lskarnet
-s6-tai64ndiff: src/s6-portable-utils/s6-tai64ndiff.o
-s6-tail: EXTRA_LIBS := -lskarnet
-s6-tail: src/s6-portable-utils/s6-tail.o
-s6-touch: EXTRA_LIBS := -lskarnet
-s6-touch: src/s6-portable-utils/s6-touch.o
+s6-tai64ndiff: EXTRA_LIBS :=
+s6-tai64ndiff: src/s6-portable-utils/s6-tai64ndiff.o -lskarnet
+s6-tail: EXTRA_LIBS :=
+s6-tail: src/s6-portable-utils/s6-tail.o -lskarnet
+s6-touch: EXTRA_LIBS :=
+s6-touch: src/s6-portable-utils/s6-touch.o -lskarnet
s6-true: EXTRA_LIBS :=
s6-true: src/s6-portable-utils/s6-true.o
-s6-uniquename: EXTRA_LIBS := -lskarnet
-s6-uniquename: src/s6-portable-utils/s6-uniquename.o
-s6-unquote: EXTRA_LIBS := -lskarnet
-s6-unquote: src/s6-portable-utils/s6-unquote.o
-s6-unquote-filter: EXTRA_LIBS := -lskarnet
-s6-unquote-filter: src/s6-portable-utils/s6-unquote-filter.o
-s6-update-symlinks: EXTRA_LIBS := -lskarnet
-s6-update-symlinks: src/s6-portable-utils/s6-update-symlinks.o
-seekablepipe: EXTRA_LIBS := -lskarnet
-seekablepipe: src/s6-portable-utils/seekablepipe.o
+s6-uniquename: EXTRA_LIBS :=
+s6-uniquename: src/s6-portable-utils/s6-uniquename.o -lskarnet
+s6-unquote: EXTRA_LIBS :=
+s6-unquote: src/s6-portable-utils/s6-unquote.o -lskarnet
+s6-unquote-filter: EXTRA_LIBS :=
+s6-unquote-filter: src/s6-portable-utils/s6-unquote-filter.o -lskarnet
+s6-update-symlinks: EXTRA_LIBS :=
+s6-update-symlinks: src/s6-portable-utils/s6-update-symlinks.o -lskarnet
+seekablepipe: EXTRA_LIBS :=
+seekablepipe: src/s6-portable-utils/seekablepipe.o -lskarnet
INTERNAL_LIBS :=
diff --git a/package/info b/package/info
index aae7ea2..f236b84 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
package=s6-portable-utils
-version=2.3.0.5
+version=2.3.1.0
category=admin
package_macro_name=S6_PORTABLE_UTILS