commit bad3cf114631f02c2f88de387e82b14591e7cb39 parent 4ad1fcff8e03ff2f7d713f83441fd5ea8042c623 Author: Laurent Bercot <ska-skaware@skarnet.org> Date: Mon, 20 Aug 2018 11:18:35 +0000 Better support for slashpackage nsss builds Diffstat:
| M | configure | | | 19 | +++++++++++++------ |
| M | package/deps-build | | | 1 | + |
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/configure b/configure @@ -250,12 +250,19 @@ if $slashpackage ; then libdir=${home}/library libexecdir=$bindir includedir=${home}/include - while read dep ; do - addincpath="$addincpath -I${sproot}${dep}/include" - vpaths="$vpaths ${sproot}${dep}/library" - addlibspath="$addlibspath -L${sproot}${dep}/library" - vpathd="$vpathd ${sproot}${dep}/library.so" - addlibdpath="$addlibdpath -L${sproot}${dep}/library.so" + while read dep condvar ; do + if test -n "$condvar" ; then + eval "cond=$condvar" + else + cond=true + fi + if $cond ; then + addincpath="$addincpath -I${sproot}${dep}/include" + vpaths="$vpaths ${sproot}${dep}/library" + addlibspath="$addlibspath -L${sproot}${dep}/library" + vpathd="$vpathd ${sproot}${dep}/library.so" + addlibdpath="$addlibdpath -L${sproot}${dep}/library.so" + fi done < package/deps-build fi diff --git a/package/deps-build b/package/deps-build @@ -1,2 +1,3 @@ /package/prog/skalibs +/package/admin/nsss $usensss /package/admin/execline