diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2025-06-30 22:43:35 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2025-06-30 22:43:35 +0000 |
| commit | b4124b4fd1b7800ef8da2bdee062d6756a3c14bb (patch) | |
| tree | 1429d4bb230ba3a6547b43f2880b9fd98d3e3d92 | |
| parent | 2886e2619038848df28765b495a7aa1a9daf1e34 (diff) | |
| download | s6-frontend-b4124b4fd1b7800ef8da2bdee062d6756a3c14bb.tar.gz | |
Hard depend on nsss, part 2
Signed-off-by: Laurent Bercot <ska@appnovation.com>
| -rwxr-xr-x | configure | 14 | ||||
| -rw-r--r-- | package/configure-snippets/configure_case_lines | 2 | ||||
| -rw-r--r-- | package/configure-snippets/configure_generate_make | 10 | ||||
| -rw-r--r-- | package/configure-snippets/configure_help_options | 1 | ||||
| -rw-r--r-- | package/configure-snippets/configure_init_vars | 1 |
5 files changed, 4 insertions, 24 deletions
@@ -53,7 +53,6 @@ Optional features: --enable-pkgconfig Build and install .pc files for pkg-config [disabled] --enable-slashpackage[=ROOT] assume /package installation at ROOT [disabled] --enable-absolute-paths hardcode absolute BINDIR/foobar paths in binaries [disabled] - --enable-nsss use the nsss library for user information [disabled] --disable-s6li do not use s6-linux-init functionality [enabled] --enable-util-linux use util-linux functionality [disabled] --enable-aliases-daemontools build emulation of daemontools programs [disabled] @@ -185,7 +184,6 @@ repodir=/var/lib/s6-frontend/s6-rc/repository bootdir=/etc/s6-rc stmpdir=/run/s6-frontend defpath='$libdir/s6-frontend/s6-rc/source:$sysconfdir/s6-frontend/s6-rc/source' -usensss=false uses6li=true useutillinux=false adaemontools=false @@ -234,8 +232,6 @@ for arg ; do --bootdir=*) bootdir=${arg#*=} ;; --stmpdir=*) stmpdir=${arg#*=} ;; --with-def-path=*) defpath=${arg#*=} ;; - --enable-nsss|--enable-nsss=yes) usensss=true ;; - --disable-nsss|--enable-nsss=no) usensss=false ;; --enable-s6li|--enable-s6li=yes) uses6li=true ;; --disable-s6li|--enable-s6li=no) uses6li=false ;; --enable-util-linux|--enable-util-linux=yes) useutillinux=true ;; @@ -551,14 +547,8 @@ if $allpic ; then else echo "STATIC_LIBS_ARE_PIC :=" fi -if $usensss ; then - echo "LIBNSSS := -lnsss" - echo "MAYBEPTHREAD_LIB := -lpthread" -else - echo "LIBNSSS :=" - echo "MAYBEPTHREAD_LIB :=" -fi - +echo "LIBNSSS := -lnsss" +echo "MAYBEPTHREAD_LIB := -lpthread" echo "REPODIR := $repodir" echo "BOOTDIR := $bootdir" echo "STMPDIR := $stmpdir" diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines index 9285b48..702f462 100644 --- a/package/configure-snippets/configure_case_lines +++ b/package/configure-snippets/configure_case_lines @@ -4,8 +4,6 @@ --bootdir=*) bootdir=${arg#*=} ;; --stmpdir=*) stmpdir=${arg#*=} ;; --with-def-path=*) defpath=${arg#*=} ;; - --enable-nsss|--enable-nsss=yes) usensss=true ;; - --disable-nsss|--enable-nsss=no) usensss=false ;; --enable-s6li|--enable-s6li=yes) uses6li=true ;; --disable-s6li|--enable-s6li=no) uses6li=false ;; --enable-util-linux|--enable-util-linux=yes) useutillinux=true ;; diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make index f1d25a8..50b068c 100644 --- a/package/configure-snippets/configure_generate_make +++ b/package/configure-snippets/configure_generate_make @@ -1,11 +1,5 @@ -if $usensss ; then - echo "LIBNSSS := -lnsss" - echo "MAYBEPTHREAD_LIB := -lpthread" -else - echo "LIBNSSS :=" - echo "MAYBEPTHREAD_LIB :=" -fi - +echo "LIBNSSS := -lnsss" +echo "MAYBEPTHREAD_LIB := -lpthread" echo "REPODIR := $repodir" echo "BOOTDIR := $bootdir" echo "STMPDIR := $stmpdir" diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options index 8ef4317..c5d4e07 100644 --- a/package/configure-snippets/configure_help_options +++ b/package/configure-snippets/configure_help_options @@ -1,4 +1,3 @@ - --enable-nsss use the nsss library for user information [disabled] --disable-s6li do not use s6-linux-init functionality [enabled] --enable-util-linux use util-linux functionality [disabled] --enable-aliases-daemontools build emulation of daemontools programs [disabled] diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars index c6dc45d..3413e00 100644 --- a/package/configure-snippets/configure_init_vars +++ b/package/configure-snippets/configure_init_vars @@ -4,7 +4,6 @@ repodir=/var/lib/s6-frontend/s6-rc/repository bootdir=/etc/s6-rc stmpdir=/run/s6-frontend defpath='$libdir/s6-frontend/s6-rc/source:$sysconfdir/s6-frontend/s6-rc/source' -usensss=false uses6li=true useutillinux=false adaemontools=false |