From 62ca2e2698fbd0cc94b40bdc8d355a3a5d1ea239 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 20 Aug 2018 11:21:32 +0000 Subject: Better support for nsss slashpackage builds --- configure | 19 +++++++++++++------ package/deps-build | 1 + 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/configure b/configure index f076816..9dc24f6 100755 --- a/configure +++ b/configure @@ -257,12 +257,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 index 05d5af4..eb4384b 100644 --- a/package/deps-build +++ b/package/deps-build @@ -1 +1,2 @@ /package/prog/skalibs +/package/admin/nsss $usensss -- cgit 1.4.1