s6

commit 6c21e61d1dfc11951841607132bf5eee8e7affc9
parent 6b47e7d8a9c1f55f36fadc7ad9061fc69488f934
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date:   Wed,  1 Aug 2018 20:35:09 +0000

 Add nsss support

Diffstat:
M
configure
 | 
11
+++++++++++
M
package/deps.mak
 | 
4
++--
M
src/daemontools-extras/deps-exe/s6-envuidgid
 | 
2
++

3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
@@ -44,6 +44,7 @@ Optional features:
   --enable-slashpackage[=ROOT]  assume /package installation at ROOT [disabled]
   --enable-absolute-paths       do not rely on PATH to access this package's binaries,
                                   hardcode absolute BINDIR/foobar paths instead [disabled]
+  --enable-nsss                 use the nsss library for user information [disabled]
 
 EOF
 exit 0
@@ -146,6 +147,7 @@ static=true
 allpic=detect
 slashpackage=false
 abspath=false
+usensss=false
 sproot=
 home=
 exthome=
@@ -187,6 +189,8 @@ for arg ; do
     --disable-slashpackage) sproot= ; slashpackage=false ;;
     --enable-absolute-paths|--enable-absolute-paths=yes) abspath=true ;;
     --disable-absolute-paths|--enable-absolute-paths=no) abspath=false ;;
+    --enable-nsss|--enable-nsss=yes) usensss=true ;;
+    --disable-nsss|--enable-nsss=no) usensss=false ;;
     --enable-*|--disable-*|--with-*|--without-*|--*dir=*) ;;
     --host=*|--target=*) target=${arg#*=} ;;
     --build=*) build=${arg#*=} ;;
@@ -427,6 +431,13 @@ 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
 
 exec 1>&3 3>&-
 echo "  ... done."
diff --git a/package/deps.mak b/package/deps.mak
@@ -168,8 +168,8 @@ s6-applyuidgid: EXTRA_LIBS :=
 s6-applyuidgid: src/daemontools-extras/s6-applyuidgid.o -lskarnet
 s6-envdir: EXTRA_LIBS :=
 s6-envdir: src/daemontools-extras/s6-envdir.o -lskarnet
-s6-envuidgid: EXTRA_LIBS :=
-s6-envuidgid: src/daemontools-extras/s6-envuidgid.o -lskarnet
+s6-envuidgid: EXTRA_LIBS := ${MAYBEPTHREAD_LIB}
+s6-envuidgid: src/daemontools-extras/s6-envuidgid.o ${LIBNSSS} -lskarnet
 s6-fghack: EXTRA_LIBS :=
 s6-fghack: src/daemontools-extras/s6-fghack.o -lskarnet
 s6-log: EXTRA_LIBS := ${TAINNOW_LIB}
diff --git a/src/daemontools-extras/deps-exe/s6-envuidgid b/src/daemontools-extras/deps-exe/s6-envuidgid
@@ -1 +1,3 @@
+${LIBNSSS}
 -lskarnet
+${MAYBEPTHREAD_LIB}