Move to new system, support pkg-config

Signed-off-by: Laurent Bercot <ska@appnovation.com>

12 files changed, 67 insertions, 12 deletions

diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines
new file mode 100644
index 0000000..de46c9c
--- /dev/null
+++ b/package/configure-snippets/configure_case_lines
@@ -0,0 +1,8 @@
+    --enable-nsss|--enable-nsss=yes) usensss=true ;;
+    --disable-nsss|--enable-nsss=no) usensss=false ;;
+    --enable-aliases-daemontools|--enable-aliases-daemontools=yes) adaemontools=true ;;
+    --disable-aliases-daemontools|--enable-aliases-daemontools=no) adaemontools=false ;;
+    --enable-aliases-runit|--enable-aliases-runit=yes) arunit=true ;;
+    --disable-aliases-runit|--enable-aliases-runit=no) arunit=false ;;
+    --enable-aliases-symlinks|--enable-aliases-symlinks=yes) asymlinks=true ;;
+    --disable-aliases-symlinks|--enable-aliases-symlinks=no) asymlinks=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..d5af459
--- /dev/null
+++ b/package/configure-snippets/configure_generate_configh
@@ -0,0 +1,8 @@
+echo "#undef ${package_macro_name}_WRAP_DAEMONTOOLS"
+if $adaemontools ; then
+  echo "#define ${package_macro_name}_WRAP_DAEMONTOOLS"
+fi
+echo "#undef ${package_macro_name}_WRAP_RUNIT"
+if $arunit ; then
+  echo "#define ${package_macro_name}_WRAP_RUNIT"
+fi
diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make
new file mode 100644
index 0000000..bbbe613
--- /dev/null
+++ b/package/configure-snippets/configure_generate_make
@@ -0,0 +1,22 @@
+if $usensss ; then
+  echo "LIBNSSS := -lnsss"
+  echo "MAYBEPTHREAD_LIB := -lpthread"
+else
+  echo "LIBNSSS :="
+  echo "MAYBEPTHREAD_LIB :="
+fi
+if $adaemontools ; then
+  echo "WRAP_DAEMONTOOLS := 1"
+else
+  echo "WRAP_DAEMONTOOLS :="
+fi
+if $arunit ; then
+  echo "WRAP_RUNIT := 1"
+else
+  echo "WRAP_RUNIT :="
+fi
+if $asymlinks ; then
+  echo "WRAP_SYMLINKS := 1"
+else
+  echo "WRAP_SYMLINKS :="
+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..ec1eb12
--- /dev/null
+++ b/package/configure-snippets/configure_help_options
@@ -0,0 +1,5 @@
+  --enable-nsss                 use the nsss library for user information [disabled]
+  --enable-aliases-daemontools  build emulation of daemontools programs [disabled]
+  --enable-aliases-runit        build emulation of runit programs [disabled]
+  --disable-aliases-symlinks    do not create daemontools/runit multicall symlinks [enabled]
+
diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars
new file mode 100644
index 0000000..ec51f80
--- /dev/null
+++ b/package/configure-snippets/configure_init_vars
@@ -0,0 +1,4 @@
+usensss=false
+adaemontools=false
+arunit=false
+asymlinks=true
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 cc1abb1..49d5ca5 100644
--- a/package/deps-build
+++ b/package/deps-build
@@ -1,4 +1,6 @@
-/package/prog/skalibs
-/package/admin/execline
-/package/admin/s6
-/package/admin/s6-rc
+true		true	/package/prog/skalibs		2.14.4.0	libskarnet
+$usensss	false	/package/admin/nsss		0.2.1.0		libnsss
+true		false	/package/admin/execline		2.9.7.0		libexecline
+true		false	/package/admin/s6		2.13.2.0	libs6 libs6auto
+true		false	/package/admin/s6-rc		0.5.6.0		libs6rc
+true		false	/package/admin/s6-linux-init	1.1.3.0
diff --git a/package/deps.mak b/package/deps.mak
index ec41fd5..cb84393 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -7,11 +7,12 @@ src/alias/s6-frontend-alias-sv.o src/alias/s6-frontend-alias-sv.lo: src/alias/s6
 src/alias/s6-frontend-alias.o src/alias/s6-frontend-alias.lo: src/alias/s6-frontend-alias.c src/include/s6-frontend/config.h
 src/config/s6-frontend-config-preprocess.o src/config/s6-frontend-config-preprocess.lo: src/config/s6-frontend-config-preprocess.c
 
-s6-frontend-alias: EXTRA_LIBS := -lskarnet
-s6-frontend-alias: src/alias/s6-frontend-alias.o
-s6-frontend-alias-chpst: EXTRA_LIBS := -lskarnet
-s6-frontend-alias-chpst: src/alias/s6-frontend-alias-chpst.o
-s6-frontend-alias-sv: EXTRA_LIBS := -ls6 -lskarnet ${SPAWN_LIB}
-s6-frontend-alias-sv: src/alias/s6-frontend-alias-sv.o
-s6-frontend-config-preprocess: EXTRA_LIBS := -lskarnet
-s6-frontend-config-preprocess: src/config/s6-frontend-config-preprocess.o
+s6-frontend-alias: EXTRA_LIBS :=
+s6-frontend-alias: src/alias/s6-frontend-alias.o -lskarnet
+s6-frontend-alias-chpst: EXTRA_LIBS := ${MAYBEPTHREAD_LIB}
+s6-frontend-alias-chpst: src/alias/s6-frontend-alias-chpst.o ${LIBNSSS} -lskarnet
+s6-frontend-alias-sv: EXTRA_LIBS := ${SPAWN_LIB}
+s6-frontend-alias-sv: src/alias/s6-frontend-alias-sv.o -ls6 -lskarnet
+s6-frontend-config-preprocess: EXTRA_LIBS :=
+s6-frontend-config-preprocess: src/config/s6-frontend-config-preprocess.o -lskarnet
+INTERNAL_LIBS :=