From 29bd7fd3ce371eaad00ffbb367071f1007f216d3 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 20 Aug 2018 11:41:33 +0000 Subject: Support conditional slashpackage builds --- configure | 19 +++++++++++++------ package/deps-build | 1 + 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 7331583..db87900 100755 --- a/configure +++ b/configure @@ -259,12 +259,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 dcd2abc..c33cb48 100644 --- a/package/deps-build +++ b/package/deps-build @@ -1,4 +1,5 @@ /package/prog/skalibs +/package/admin/nsss $usensss /package/admin/execline /package/admin/s6 /package/web/s6-dns -- cgit v1.2.3