diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2018-08-20 11:39:05 +0000 |
---|---|---|
committer | Laurent Bercot <ska-skaware@skarnet.org> | 2018-08-20 11:39:05 +0000 |
commit | 2c3f58f0959604af0eca3b4d9d623a738a0e70e6 (patch) | |
tree | e3983225bd53e6a1c231c1f7bd52a1fded868bfb | |
parent | 1e887c420a1e0367de77cda37dee93587ae7ae2a (diff) | |
download | s6-portable-utils-2c3f58f0959604af0eca3b4d9d623a738a0e70e6.tar.xz |
Support conditional slashpackage builds
-rwxr-xr-x | configure | 19 |
1 files changed, 13 insertions, 6 deletions
@@ -246,12 +246,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 |